song: Fix itunes issue.

.travis.yml

@@ -9,15 +9,14 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi
 
-install:
-  # Install a custom version of shellcheck instead of Travis CI's default
-  - scversion="latest" # or "v0.4.7", or "latest"
-  - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz"
-  - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz"
-  - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; }
-
 script:
     - time ./neofetch --travis -v
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; fi
+    # See this wiki page for why we're disabling these errors.
+    # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117; fi
+    # The if statement is here to invert the exit code from grep.
+    # grep normally errors if no match is found but we want the opposite.
+    # We invert it so grep fails if a match is found.
     # Check for lines longer than 100 chars.
-    - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi
+    # There are 3 lines that must be longer than 100 chars.
+    - if (("$(grep '.\{101\}' neofetch | wc -l)" > 3)); then (exit 1); else (exit 0); fi

CHANGELOG.md

@@ -7,113 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-**Contributors**
+- [ascii] Fixed a bug causing Windows 7 ASCII art to not display.
-
+- [image] Added new option to configure the resolution of `catimg`.
-- [**@nero**](https://github.com/nero)
+- [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt")
-- [**@alyssais**](https://github.com/alyssais)
-- [**@plgruener**](https://github.com/plgruener)
-
-**Info**
-
-- **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero)
-- **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais)
-- **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux.
-- **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener)
-
-**ASCII**
-
-- Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener)
-
-## [5.0.0] - 2018-06-18
-
-<img src="https://i.imgur.com/ZQI2EYz.png" alt="logo" height="100px">
-
-A lot of the script has been rewritten and all lint errors have been resolved. There's probably a few bugs so the version number has been bumped to `5.0`. Expect a minor release in the coming days to fix any bugs that come up. Thanks to everyone who contributed to this release.
-
-**Contributors**
-
-- [**@arisinfenix**](https://github.com/arisinfenix)
-- [**@iandrewt**](https://github.com/iandrewt)
-- [**@konimex**](https://github.com/konimex)
-- [**@MindTooth**](https://github.com/MindTooth)
-
-**Operating System**
-
-- Added support for Condres OS. [**@arisinfenix**](https://github.com/arisinfenix)
-- Added support for RedCore Linux. [**@arisinfenix**](https://github.com/arisinfenix)
-- Added support for Regata OS. [**@arisinfenix**](https://github.com/arisinfenix)
-- Added support for ClearOS. [**@arisinfenix**](https://github.com/arisinfenix)
-- Added support for PureOS.
-- Added support for Kibojoe Linux.
-- Added support for SharkLinux.
-- Added support for Linux Lite.
-- Added support for macOS 10.14 Mojave. [**@iandrewt**](https://github.com/iandrewt)
-
-**General**
-
-- **output**: Added `--json` to output the info in `json`.
-- **cursor**: Fixed prompt location issues after Neofetch is run.
-- **macOS**: Fixed neofetch launching XQuartz.
-- **misc**: Removed `uppercase()`.
-- **misc**: Removed all instances of `export`.
-- **misc**: Removed all deprecated options and functions.
-- **info**: Removed `get_install_date()`.
-
-**Ascii**
-
-- Fixed a bug causing Windows 7 ASCII art to not display.
-- Simplified ASCII art handling.
-- Updated Funtoo ASCII art.
-
-**Image**
-
-- Improved performance of image handling.
-- Removed `catimg` support (*It didn’t allow us to specify height so we
-  couldn’t accurately place the cursor*).
-- Fixed `tycat`, `sixel` and `kitty icat` image sizes.
-- Simplified `w3m-img` code.
-
-**Screenshot**
-
-See: https://github.com/dylanaraps/neofetch/issues/1001
-
-- Removed screenshot functionality.
-- Removed screenshot upload functionality.
-
-**Info**
-
-- **cpu**: Remove extra call to `uname`.
-- **cpu**: Simplify core calculation.
-- **disk**: Clean up.
-- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt")
-- **gpu**: Fixed ATI/AMD branding issue.
-- **gpu**: Removed `glxinfo` usage (*too slow*).
-- **packages**: Added support for `flatpak`. [**@konimex**](https://github.com/konimex)
-- **packages**: Added support for `snap`. [**@konimex**](https://github.com/konimex)
-- **packages**: Added used package managers to output (`Packages: 900
-  (pacman, snap)`).
-- **packages**: Fixed issues with `pacman` 5.1.
-- **packages**: Fixed issues with `dpkg`.
-- **packages**: Removed `find` usage.
-- **packages**: Removed `ls` usage.
-- **packages**: Removed `wc -l` usage.
-- **song**: Added support for `gmusicbrowser`. [**@arisinfenix**](https://github.com/arisinfenix)
-- **song**: Added support for `SMPlayer`. [**@arisinfenix**](https://github.com/arisinfenix)
-- **song**: Added support for `Dragon Player`. [**@arisinfenix**](https://github.com/arisinfenix)
-- **song**: Fixed song detection on macOS.
-- **song**: Fixed song output on systems using `C` locale.
-- **song**: Added `mpc_args` to send additional arguments to `mpc`.
-- **term\_font**: Clean up of config file handling.
-- **resolution**: Added support for `xwininfo`.
 
 ## [4.0.2] - 2018-05-19
 
-### This fixes default config issues on Android, AIX, HP-UX and possibly others.
-
 - [config] Fixed `/dev/stdin` error.
 - [config] Added `--print_config` to display the default config file.
 - [macOS] Fixed xquartz issue.
 
+
 ## [4.0.1] - 2018-05-18
 
 ### Note: This release is only required for those running `bash <3.3`.
@@ -2776,8 +2680,7 @@ Changelog:
 Let me know if you're having issues.
 
 
-[Unreleased]: https://github.com/dylanaraps/neofetch/compare/5.0.0...HEAD
+[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.2...HEAD
-[5.0.0]: https://github.com/dylanaraps/neofetch/compare/4.0.2...5.0.0
 [4.0.2]: https://github.com/dylanaraps/neofetch/compare/4.0.1...4.0.2
 [4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0

CONTRIBUTING.md

@@ -23,15 +23,20 @@
   and variable names.
 - Keep lines below `100` characters long.
 - Use `[[ ]]` for tests.
-- Quote **EVERYTHING**.
+- Double Quote **EVERYTHING**.
+- Don’t use single quotes, except for special cases.
 
 ### ShellCheck
 
 For your contribution to be accepted, your changes need to pass
 ShellCheck.
 
+Run ShellCheck with the following command:
+
 ```sh
-shellcheck neofetch
+# Why do we exclude numerous tests?
+# See: https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions
+shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117
 ```
 
 **Note**: If you have trouble installing ShellCheck. You can open a pull
@@ -53,8 +58,6 @@ request on the repo and our Travis.ci hook will run ShellCheck for you.
     - Use `bash`'s built-in syntax (`file="$(< /path/to/file.txt)")`).
 - Don’t use `grep "pattern" | awk '{ printf }'`.
     - Use `awk '/pattern/ { printf }'`
-- Don’t use `wc`.
-    - Use `${#var}` or `${#arr[@]}`.
 
 
 ### If Statements

README.md

@@ -6,8 +6,7 @@
 <a href="https://travis-ci.org/dylanaraps/neofetch"><img src="https://travis-ci.org/dylanaraps/neofetch.svg?branch=master"></a>
 <a href="./LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
 <a href="https://github.com/dylanaraps/neofetch/releases"><img src="https://img.shields.io/github/release/dylanaraps/neofetch.svg"></a>
-<a href="https://repology.org/metapackage/neofetch"><img src="https://repology.org/badge/tiny-repos/neofetch.svg" alt="Packaging status"></a>
+<a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"></a>
-<a href="#donate"><img src="https://img.shields.io/badge/donate-donate-yellow.svg"></a>
 </p>
 
 <img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" align="right" height="240px">
@@ -43,7 +42,6 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows,
 - https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/
 - https://www.youtube.com/watch?v=bgepGW858fc
 - https://www.linuxuprising.com/2018/05/display-system-information-on-linux.html
-- https://esgeeks.com/neofetch-informacion-sistema-linux/
 
 
 ## Thanks
@@ -56,7 +54,6 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows,
 
 ## Donate
 
-Donations allow me to spend more time working on `neofetch` and my other Open Source projects. If you like `neofetch` and want to give back in some way you can donate at the links below.
+Donations will allow me to spend more time working on `neofetch`.
-
-<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V7QNJNKS3WYVS"><img src="https://img.shields.io/badge/donate-paypal-yellow.svg"></a> <a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"> </a><a href="https://liberapay.com/2211/"><img src="https://img.shields.io/badge/donate-liberapay-yellow.svg"></a>
 
+If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla**

neofetch.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH NEOFETCH "1" "June 2018" "Neofetch 5.0.1" "User Commands"
+.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.3" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -16,15 +16,10 @@ NOTE: Every launch flag has a config option.
 .TP
 \fB\-\-disable\fR infoname
 Allows you to disable an info line from appearing
-in the output. 'infoname' is the function name from the
+in the output.
-\&'print_info()' function inside the config file.
-For example: 'info "Memory" memory' would be '\-\-disable memory'
 .IP
 NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu'
 .TP
-\fB\-\-package_managers\fR on/off
-Hide/Show Package Manager names . (tiny, on, off)
-.TP
 \fB\-\-os_arch\fR on/off
 Hide/Show OS architecture.
 .TP
@@ -129,6 +124,12 @@ Print the Artist/Album/Title on separate lines.
 \fB\-\-music_player\fR player\-name
 Manually specify a player to use.
 Available values are listed in the config file
+.TP
+\fB\-\-install_time\fR on/off
+Enable/Disable showing the time in Install Date output.
+.TP
+\fB\-\-install_time_format\fR 12h/24h
+Set time format in Install Date to be 12 hour or 24 hour.
 .SS "TEXT FORMATTING:"
 .TP
 \fB\-\-colors\fR x x x x x x
@@ -190,7 +191,7 @@ Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-backend\fR backend
 Which image backend to use.
-Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off',
+Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off',
 \&'sixel', 'tycat', 'w3m'
 .TP
 \fB\-\-source\fR source
@@ -204,6 +205,9 @@ Shortcut to use 'ascii' backend.
 \fB\-\-caca\fR source
 Shortcut to use 'caca' backend.
 .TP
+\fB\-\-catimg\fR source
+Shortcut to use 'catimg' backend.
+.TP
 \fB\-\-iterm2\fR source
 Shortcut to use 'iterm2' backend.
 .TP
@@ -229,7 +233,7 @@ Shortcut to use 'tycat' backend.
 Shortcut to use 'w3m' backend.
 .TP
 \fB\-\-off\fR
-Shortcut to use 'off' backend (Disable ascii art).
+Shortcut to use 'off' backend.
 .IP
 NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img',
 \&'/path/to/ascii', '/path/to/dir/'
@@ -260,6 +264,8 @@ Whether or not to bold the ascii logo.
 .TP
 \fB\-L\fR, \fB\-\-logo\fR
 Hide the info text and only show the ascii logo.
+.IP
+Possible values: bar, infobar, barinfo, off
 .SS "IMAGE:"
 .TP
 \fB\-\-loop\fR
@@ -270,6 +276,9 @@ in some terminals emulators when using image mode.
 How to size the image.
 Possible values: auto, 00px, 00%, none
 .TP
+\fB\-\-catimg_size\fR 1/2
+Change the resolution of catimg.
+.TP
 \fB\-\-crop_mode\fR mode
 Which crop mode to use
 Takes the values: normal, fit, fill