general: Use $HOSTTYPE instead of uname.

song: sort players in config

.travis.yml

@@ -20,4 +20,3 @@ script:
     # 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 [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd tests && ./test.sh; fi

CHANGELOG.md

@@ -7,9 +7,66 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-    
+**Contributors**
+
+- [**@mstraube**](https://github.com/mstraube)
+- [**@iandrewt**](https://github.com/iandrewt")
+
+**Operating System**
+
+- Added support for RedCore Linux. [**@mstraube**](https://github.com/mstraube)
+
+**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`.
+
+**Ascii**
+
+- Fixed a bug causing Windows 7 ASCII art to not display.
+
+**Image**
+
+- 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.
+
+**Screenshot**
+
+- 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.
+
+## [4.0.2] - 2018-05-19
+
+- [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`.
+
+- [config] Fixed issue with default config in bash3.
+- [packages] Simplified code.
+- [term] Fixed macOS issue.
+- [term] Fixed `tmux` issue.
+
+
 ## [4.0.0] - 2018-05-17
 
+<h1><img src="https://i.imgur.com/JFxwJtU.png" alt="logo" height="100px"></h1>
+
 This release bumps the version number up to `4.0.0` as it contains major
 changes to how Neofetch is packaged and installed.
 
@@ -27,7 +84,7 @@ it. :+1:
 
 ## Discord
 
-Neofetch now has a Discord server. Come and join the discussion! 
+Neofetch now has a Discord server. Come and join the discussion!
 
 <a
 href="https://discord.gg/BtnTPFF"><img
@@ -113,12 +170,12 @@ src="https://img.shields.io/discord/440354555197128704.svg"></a>
 
 - Added support for detecting `dwm`.
 
-    
+
 ## [3.4.0] - 2018-04-05
 
 This release adds support for a large number of Linux distros as well as support for the latest macOS and iOS devices. This release also contains a large number of bug fixes and some minor features.
 
-I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! 
+I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release!
 
 ## Contributors
 
@@ -271,7 +328,7 @@ I'm pretty sure that this release is the largest in terms of number of contribut
 - Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris)
 - Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris)
 
-    
+
 ## [3.3.0] - 2017-09-14
 
 Thanks to everyone who contributed this release, I appreciate ya!
@@ -399,13 +456,13 @@ Thanks to everyone who contributed this release, I appreciate ya!
 - Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)**
 - Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)**
 
-    
+
 ## [3.2.0] - 2017-06-21
 
-This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. 
+This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs.
 
 
-Thanks once again to everyone that contributed! 
+Thanks once again to everyone that contributed!
 
 
 ## Contributors
@@ -485,7 +542,7 @@ Thanks once again to everyone that contributed!
 
 - [FreeBSD]: Fix inaccurate free memory calculation.
 
-    
+
 ## [3.1.0] - 2017-04-25
 
 Hi, It's been quite a while since the last release. I've been extremely busy with university and I finally found some time to flag a new release. (I've been meaning to do this for a few weeks now)
@@ -598,7 +655,7 @@ The screenshot feature no longer requires any configuration before working. We n
 
 - [Linux] Hide duplicate GPU lines (Only display 1).
 
-    
+
 ## [3.0.1] - 2017-01-30
 
 This minor release fixes all of the bugs that were found in the 3.0 release.
@@ -667,12 +724,12 @@ Thanks for all of the bug reports and contributions. :)
 ## Scrot
 - Added message to let users know that a screenshot was taken.
 
-    
+
 ## [3.0] - 2017-01-23
 
-This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. 
+This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up.
 
-The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. 
+The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise.
 
 Neofetch now supports displaying images using `catimg`, `libcaca` and `jp2a`. See this wiki page for screenshots. https://github.com/dylanaraps/neofetch/wiki/Image-Backends
 
@@ -887,7 +944,7 @@ I have given collaborator access to both **[@konimex](https://github.com/konimex
 - Fixed bug where `neofetch --config` sourced the user config twice.
 - Cleaned up config arg handling.
 
-    
+
 ## [2.0.2] - 2016-12-07
 
 This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important.
@@ -907,7 +964,7 @@ I also want to apologize to those packaging Neofetch for this unexpected release
 **Theme**<br \>
 - [Cinnamon] Fixed incorrect information.
 
-    
+
 ## [2.0.1] - 2016-12-06
 
 This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more.
@@ -991,7 +1048,7 @@ The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still t
   - teknik doesn't compress images whereas imgur does.
   - You can change this back to imgur by using `--image_host imgur` or by editing your config file.
 
-    
+
 ## [2.0] - 2016-12-02
 
 This is the biggest release of Neofetch in a long time. 97 files were changed with 2700~ additions to 2900~ deletions. Although the changelog isn't as interesting this time majority of the script has been rewritten, restructered and cleaned up. Every function and variable name follows a proper naming scheme and a large number of bugs were fixed.
@@ -1127,12 +1184,12 @@ Thanks to all of the contributors this time around, you guys are a big help and
 **Resolution**<br \>
 - [MacOS] If refresh rate is empty don't append Hz.
 
-    
+
 ## [1.9.1] - 2016-11-04
 
 This is a small release which fixes various issues found in 1.9.
 
-Note: Those packaging neofetch can ignore the new file: `config/travis` 
+Note: Those packaging neofetch can ignore the new file: `config/travis`
 
 ## Contributors
 - **[@konimex](https://github.com/konimex)**
@@ -1182,7 +1239,7 @@ Note: Those packaging neofetch can ignore the new file: `config/travis`
 **Memory**<br \>
 - [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)**
 
-    
+
 ## [1.9] - 2016-11-01
 
 This change log won't cover everything that's changed. Have a look through the commit
@@ -1215,7 +1272,7 @@ Thanks to everyone below who contributed, it's nice to see some new faces too. :
 - Added support for Android.
   - Dependencies:
     - Required: `bash` and `busybox`
-    - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully 
+    - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully
       working Linux environment, doesn't require root acess and includes all dependencies.
     - Note2: Neofetch will be packaged in `termux` thanks to **[@konimex](https://github.com/konimex)**
       - PR [#351](https://github.com/termux/termux-packages/pull/531)
@@ -1344,7 +1401,7 @@ Note: `\033[14t` is still supported, if images already work for you then you don
 - Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)**
 - Rewrote song function, it's now much faster/cleaner.
 
-    
+
 ## [1.8.1] - 2016-10-04
 
 This release fixes various bugs found in 1.8.
@@ -1389,7 +1446,7 @@ This release fixes various bugs found in 1.8.
 - Added logo mode which only displays the ascii art.
   - Adds two new identical flags `--logo` and `-L`.
 
-    
+
 ## [1.8] - 2016-10-02
 
 This version of neofetch is vastly different from the previous versions and this
@@ -1552,7 +1609,7 @@ now have working image support.
 - Use a pure bash solution to getting ascii size.
 - Updated Solus ascii art to match new logo. **[@undrskr](https://github.com/undrskr)**
 
-    
+
 ## [1.7] - 2016-05-14
 
 Hello, sorry this release took so long. I've been extremely busy with uni and
@@ -1719,7 +1776,7 @@ called `fg` which will set the color to your foreground color.
 [/////     ]
 ```
 
-    
+
 ## [1.6] - 2016-04-01
 
 # Neofetch 1.6
@@ -1866,7 +1923,7 @@ Thanks to the following people for contributing this release.
 ### Scrot
 - Fixed scrot function not using user defined options.
 
-    
+
 ## [1.5] - 2016-03-17
 
 # Neofetch 1.5
@@ -1960,7 +2017,7 @@ me finish up with this PR.
 ### Stdout Mode
 - Fixed issues with functions that use `prin`.
 
-    
+
 ## [1.4] - 2016-03-09
 
 Lots of bugs were fixed and a lot of code was cleaned up, this changelog just lists
@@ -2032,14 +2089,14 @@ Example:
 neofetch --stdout memory battery disk --stdout_separator "  |  "
 ```
 
-    
+
 ## [1.3] - 2016-02-26
 
 # Fetch 1.3
 
 Hey guys,
 
-This update brought some breaking changes, see this wiki page for what you'll 
+This update brought some breaking changes, see this wiki page for what you'll
 need to update in your config file.
 
 https://github.com/dylanaraps/fetch/wiki/Following-HEAD
@@ -2110,7 +2167,7 @@ much faster and cleaner.
 - Removed `--stdout_subtitles`
 - Removed `--stdout_title`
 
-    
+
 ## [1.2] - 2016-02-17
 
 # Fetch 1.2
@@ -2125,7 +2182,7 @@ https://github.com/dylanaraps/fetch/wiki/Following-HEAD
 
 ### OS
 
-We now support almost all the Linux distros Screenfetch supports excluding 
+We now support almost all the Linux distros Screenfetch supports excluding
 the distros that have been discontinued.
 
 Added support for these distros:
@@ -2223,7 +2280,7 @@ info "Font" font
 -  Fix missing ascii art when fetch is installed in /usr/local
 - Update Deepin's ascii art to their new logo
 
-    
+
 ## [1.1] - 2016-02-06
 
 # Fetch 1.1 changelog
@@ -2276,7 +2333,7 @@ the first value of `ascii_colors`. If `ascii_colors` is left empty, color will b
 
 ### Config file
 - Fetch now has a config file that you can share with people and keep between
-  script versions! [1] 
+  script versions! [1]
 - Added `--config` and `$config_file` to specify a custom config location.
 - Added `--config off`, `--config none` and `$config` to enable / disable config files
   at launch or in script.
@@ -2393,7 +2450,7 @@ Battery: 10%
 - **NOTE:** This currently doesn't support BSD systems as we have no one to help us test
   - See **[Issue #46](https://github.com/dylanaraps/fetch/issues/46)**
 
-    
+
 ## [1.0] - 2016-01-27
 
 # Fetch 1.0
@@ -2553,7 +2610,7 @@ to set the program to use to take the screenshot.
 
 ## Wiki:
 
-Added `Customizing Info` page which has info/examples about 
+Added `Customizing Info` page which has info/examples about
 the new printinfo function.
 
 https://github.com/dylanaraps/fetch/wiki/Customizing-Info
@@ -2562,7 +2619,7 @@ Added `Customization` which lists all options and their values.
 
 https://github.com/dylanaraps/fetch/wiki/Customization
 
-    
+
 ## [0.2.1] - 2016-01-04
 
 Here's what's new:
@@ -2574,19 +2631,19 @@ Here's what's new:
 - Fixed bug with multiple colons
 - Fixed underlines not being drawn the full width.
 - Functions now fallback to "Unknown" instead of printing nothing.
-- `getos` now gets os type and `getdistro` gets the distro. 
+- `getos` now gets os type and `getdistro` gets the distro.
   - This makes it even easier to add other os types.
 
 Here's what I'm working on:
-- Finishing OpenBSD support 
-- Cygwin support 
+- Finishing OpenBSD support
+- Cygwin support
 
 Enjoy
 
-    
+
 ## [0.2] - 2016-01-03
 
-I finished my rewrite! 
+I finished my rewrite!
 
 ## Here's what's new:
 - The script is now way faster.
@@ -2641,8 +2698,8 @@ Changelog:
 - The script now aligns the cursor to the bottom of the
   terminal instead of using a hardcoded amount of newlines
 - Image size and padding is now dynamic, the only difference on the user
-  side is that instead of setting a long line of spaces as 
-  padding, you set your font width. This means that you set the 
+  side is that instead of setting a long line of spaces as
+  padding, you set your font width. This means that you set the
   var once and the script will just work at any window size.
 - You can disable dynamic images and go back to the old
   behaviour with by using the `--size` or the in config var.
@@ -2658,7 +2715,9 @@ Changelog:
 Let me know if you're having issues.
 
 
-[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.0...HEAD
+[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.2...HEAD
+[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
 [3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0
 [3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0

README.md

@@ -1,4 +1,5 @@
-<h1 align="center"><img src="https://i.imgur.com/JFxwJtU.png" alt="logo" height="50px"></h1>
+<h3 align="center"><img src="https://i.imgur.com/ZQI2EYz.png" alt="logo" height="100px"></h3>
+<p align="center">A command-line system information tool written in bash 3.2+</p>
 
 <p align="center">
 <a href="https://discord.gg/BtnTPFF"><img src="https://img.shields.io/discord/440354555197128704.svg"></a>
@@ -8,9 +9,7 @@
 <a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"></a>
 </p>
 
-<a href="https://repology.org/metapackage/neofetch">
-    <img src="https://repology.org/badge/vertical-allrepos/neofetch.svg" alt="Packaging status" align="right" width="150px" height="700px">
-</a>
+<img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" align="right" height="240px">
 
 Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way.
 
@@ -18,14 +17,14 @@ The overall purpose of Neofetch is to be used in screen-shots of your system. Ne
 
 The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all.
 
+<img src="https://i.imgur.com/lUrkQBN.png" alt="neofetch" align="right" height="240px">
+
 You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones.
 
-Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.<br>
+Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
 
-<img src="https://i.imgur.com/lUrkQBN.png" alt="neofetch" align="right" width="349px">
-<img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" width="349px">
 
-### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\]
+### More: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\]
 
 ## Articles
 
@@ -42,6 +41,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows,
 - https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/
 - 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
 
 
 ## Thanks

neofetch.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH NEOFETCH "1" "May 2018" "Neofetch 4.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,7 +16,9 @@ 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.
+in the output. 'infoname' is the function name from the
+\&'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
@@ -191,7 +193,7 @@ Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-backend\fR backend
 Which image backend to use.
-Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off',
+Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off',
 \&'sixel', 'tycat', 'w3m'
 .TP
 \fB\-\-source\fR source
@@ -205,9 +207,6 @@ 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
@@ -233,7 +232,7 @@ Shortcut to use 'tycat' backend.
 Shortcut to use 'w3m' backend.
 .TP
 \fB\-\-off\fR
-Shortcut to use 'off' backend.
+Shortcut to use 'off' backend (Disable ascii art).
 .IP
 NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img',
 \&'/path/to/ascii', '/path/to/dir/'
@@ -305,19 +304,6 @@ closer to the left side.
 .TP
 \fB\-\-clean\fR
 Delete cached files and thumbnails.
-.SS "SCREENSHOT:"
-.TP
-\fB\-s\fR, \fB\-\-scrot\fR \fI\,/path/to/img\/\fP
-Take a screenshot, if path is left empty the screenshot function will use $scrot_dir and $scrot_name.
-.TP
-\fB\-su\fR, \fB\-\-upload\fR \fI\,/path/to/img\/\fP
-Same as \fB\-\-scrot\fR but uploads the scrot to a website.
-.TP
-\fB\-\-image_host\fR imgur/teknik
-Website to upload scrots to.
-.TP
-\fB\-\-scrot_cmd\fR cmd
-Screenshot program to launch
 .SS "OTHER:"
 .TP
 \fB\-\-config\fR \fI\,/path/to/config\/\fP
@@ -326,6 +312,9 @@ Specify a path to a custom config file
 \fB\-\-config\fR none
 Launch the script without a config file
 .TP
+\fB\-\-print_config\fR
+Print the default config file to stdout.
+.TP
 \fB\-\-stdout\fR
 Turn off all colors and disables any ASCII/image backend.
 .TP

tests/test.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-#
-# Run all tests.
-
-./test_misc.sh
-
-[[ -f /tmp/err ]] || exit 0 && { rm /tmp/err; exit 1; }

tests/test_misc.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-#
-# Test misc functions.
-
-source test_util.sh
-source ../neofetch
-
-# Tests only work on Linux for now.
-os="Linux"
-
-
-test_convert_time() {
-    # 24 hour time.
-    result="$(convert_time "2016" "04" "14" "23:50")"
-    assert_equals "$result" "Thu 14 Apr 2016 23:50"
-
-    # 12 hour time.
-    install_time_format="12h"
-    result="$(convert_time "2016" "04" "14" "23:50")"
-    assert_equals "$result" "Thu 14 Apr 2016 11:50 PM"
-}
-
-test_get_ppid() {
-    result="$(trim "$(get_ppid "1")")"
-    assert_equals "$result" "0"
-}
-
-
-printf "%s\\n" "Test MISC functions."
-
-test_convert_time
-test_get_ppid

tests/test_util.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#
-# Test util functions.
-
-assert_equals() {
-    # Test equality.
-    local status
-    [[ "$1" == "$2" ]] && status="✔"
-    printf "%s\\n" "  ${status:-✖} : ${FUNCNAME[1]}"
-    [[ "$1" == "$2" ]] || { :>/tmp/err; return 1; } && return 0
-}