Merge branch 'master' into install-sh

.travis.yml

@@ -17,7 +17,7 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi
 
 script:
-    - time ./neofetch --ascii --config config/travis -v
+    - time ./neofetch --ascii --config config/travis.conf -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; fi

CHANGELOG.md

 ## Contributors
 
-- **[@MatthewCox](https://github.com/MatthewCox)**
-- **[@dawidd6](https://github.com/dawidd6)**
-- **[@erikdubois](https://github.com/erikdubois)**
-- **[@mstraube](https://github.com/mstraube)**
-- **[@Artoriuz](https://github.com/Artoriuz)**
-- **[@WilsonRU](https://github.com/WilsonRU)**
-- **[@Takeya-Yuki](https://github.com/Takeya-Yuki)**
-- **[@LER0ever](https://github.com/LER0ever)**
-
-
-## Operating System
-
-- Added support for Arch XFerience. **[@mstraube](https://github.com/mstraube)**
-- Added support for CloverOS.
-- Added support for Maui. **[@mstraube](https://github.com/mstraube)**
-- Added support for KS Linux. **[@Takeya-Yuki](https://github.com/Takeya-Yuki)**
-
-
-## General
-
-- Minimum required BASH version is now 3.2.
-    - (Neofetch has always used 3.2+ features, I've just made it obvious now in the documentation.)
-- Fixed config file not being created.
-
-
-## Images
-
-- [w3m] Added `--loop` flag which makes Neofetch draw the image once per second.
-    - This is a workaround to the images disappearing on resize and workspace switch.
-    - Use Ctrl+C to exit.
-- [w3m] Fixed w3m-img not found on FreeBSD 12. **[@Artoriuz](https://github.com/Artoriuz)**
-
-
-## Ascii
-
-- Added Ubuntu-MATE ascii art.
-- Fixed ArchLabs ascii art.  **[@erikdubois](https://github.com/erikdubois)**
-- Updated GoboLinux ascii art. **[@WilsonRU](https://github.com/WilsonRU)**
-- Fixed `--ascii_distro windows10` not working.
-
 
 ## Info
 
-**Distro**
-
-- [Solaris, AIX, Haiku] The machine architecture will now be shown properly instead of machine ID.
-
-**Terminal Emulator**
+**CPU**
 
-- Added support for Neovim terminal emulator. **[@LER0ever](https://github.com/LER0ever)**
-- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)**
-- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)**
-- Use `$SSH_TTY` for terminal detection if machine is connected via SSH.
-- Break from loop if PPID can't be accessed/not found.
+- [Linux] Fixed inaccurate output on ARM SoC devices.
 
-**GPU**
+**Terminal**
 
-- [Linux] Fixed GPU sort.
+- [SSH] Fixed infinite loop if neofetch is run on non-interactive shells.
 
-**Song**
 
-- Do not detect ibus\* or indicator\* as player. **[@dawidd6](https://github.com/dawidd6)**
-
-**Model**
-
-- Specify when running on a Hackintosh. **[@LER0ever](https://github.com/LER0ever)**
-
-
-**Memory**
+## Images
 
-- [FreeBSD]: Fix inaccurate free memory calculation.
+- Fixed division by 0 error in XTerm.

README.md

@@ -10,7 +10,7 @@ Neofetch is a CLI system information tool written in BASH. Neofetch displays inf
 
 Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info.
 
-Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`.
+Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, `IRIX`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`.
 
 For more information:
 

ascii/distro/irix

+${c1}           ./ohmNd/  +dNmho/-
+     `:+ydNMMMMMMMM.-MMMMMMMMMdyo:.
+   `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh`
+   -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN.
+ `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...`
++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+
+dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd
+oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+
+.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM.
+ hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh
+ /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM:
+ `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd
+  `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/`
+     `yNMMNho-yMMMM` NMMMm.+hNMMNh`
+     -MMMMd:  oMMMM. NMMMh  :hMMMM-
+      -yNMMMmooMMMM- NMMMyomMMMNy-
+        .omMMMMMMMM-`NMMMMMMMmo.
+          `:hMMMMMM. NMMMMMh/`
+             .odNm+  /dNms.

config/config → config/config.conf

-#!/usr/bin/env bash
-#
 # Neofetch config file
 # https://github.com/dylanaraps/neofetch
 
@@ -724,4 +722,4 @@ image_host="teknik"
 #
 # NOTE: Don't change this value, neofetch reads this to determine
 # how to handle backwards compatibility.
-config_version="3.1.0-git"
+config_version="3.2.1-git"

config/travis → config/travis.conf

-#!/usr/bin/env bash
-#
 # Neofetch config file for travis.ci
 # https://github.com/dylanaraps/neofetch
 

neofetch.1

-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH NEOFETCH "1" "April 2017" "Neofetch 3.1.0-git" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH NEOFETCH "1" "June 2017" "Neofetch 3.2.1-git" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS