Merge branch 'master' into comp

dylanaraps · dylanaraps · commit 23db006fb9e0 · 2018-06-05T06:18:45.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,14 +9,15 @@ 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
-    # 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.
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; fi
     # Check for lines longer than 100 chars.
-    # 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
+    - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,44 +7,80 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+<img src="https://i.imgur.com/ZQI2EYz.png" alt="logo" height="100px">
+
 **Contributors**
 
 - [**@mstraube**](https://github.com/mstraube)
-- [**@iandrewt**](https://github.com/iandrewt")
+- [**@iandrewt**](https://github.com/iandrewt)
+- [**@konimex**](https://github.com/konimex)
 
 **Operating System**
 
+- Added support for Condres OS. [**@mstraube**](https://github.com/mstraube)
 - Added support for RedCore Linux. [**@mstraube**](https://github.com/mstraube)
+- Added support for Regata OS. [**@mstraube**](https://github.com/mstraube)
+- Added support for PureOS.
+- Added support for Kibojoe Linux.
+- Added support for SharkLinux.
+- Added support for Linux Lite.
 
 **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`.
+- **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**
 
-- [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt")
-- [gpu] Fixed ATI/AMD branding issue.
-- [song] Fixed song detection on macOS.
-- [song] Fixed song output on systems using `C` locale.
+- **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**: Removed `find` usage.
+- **packages**: Removed `ls` usage.
+- **packages**: Removed `wc -l` usage.
+- **song**: Added support for `gmusicbrowser`.
+  [**@mstraube**](https://github.com/mstraube)
+- **song**: Fixed song detection on macOS.
+- **song**: Fixed song output on systems using `C` locale.
+- **term\_font**: Clean up of config file handling.
+- **resolution**: Added support for `xwininfo`.
 
 ## [4.0.2] - 2018-05-19
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,20 +23,15 @@
   and variable names.
 - Keep lines below `100` characters long.
 - Use `[[ ]]` for tests.
-- Double Quote **EVERYTHING**.
-- Don’t use single quotes, except for special cases.
+- Quote **EVERYTHING**.
 
 ### ShellCheck
 
 For your contribution to be accepted, your changes need to pass
 ShellCheck.
 
-Run ShellCheck with the following command:
-
 ```sh
-# 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
+shellcheck neofetch
 ```
 
 **Note**: If you have trouble installing ShellCheck. You can open a pull
@@ -58,6 +53,8 @@ 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
diff --git a/README.md b/README.md
@@ -42,6 +42,7 @@ 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
diff --git a/neofetch b/neofetch
diff --git a/neofetch.1 b/neofetch.1
