From 62aca4615127743836640ec47f7fa3d61259dc99 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 06:33:27 +1000 Subject: [PATCH 1/5] packages: Fix snap issue --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6e4cd890..329724de 100755 --- a/neofetch +++ b/neofetch @@ -1297,7 +1297,10 @@ get_packages() { # List these last as they accompany regular package managers. has "flatpak" && tot flatpak list - has "snap" && tot snap list && ((packages-=1)) + + # Snap hangs if the command is run without the daemon running. + # Only run snap if the daemon is also running. + has "snap" && ps -e | grep -Fm 1 "snapd" && tot snap list && ((packages-=1)) ;; "Mac OS X" | "MINIX") From 552523edbfd9c5d72554a98771ef3150c15e19f7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 06:45:11 +1000 Subject: [PATCH 2/5] misc: cleanup --- neofetch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 329724de..fa9466ff 100755 --- a/neofetch +++ b/neofetch @@ -2291,7 +2291,7 @@ get_memory() { # Bars. case "$memory_display" in - "bar") memory="$(bar "${mem_used}" "${mem_total}")" ;; + "bar") memory="$(bar "${mem_used}" "${mem_total}")" ;; "infobar") memory="${memory} $(bar "${mem_used}" "${mem_total}")" ;; "barinfo") memory="$(bar "${mem_used}" "${mem_total}")${info_color} ${memory}" ;; esac @@ -3125,10 +3125,10 @@ get_disk() { # Bar. case "$disk_display" in - "bar") disk="$(bar "$disk_perc" "100")" ;; + "bar") disk="$(bar "$disk_perc" "100")" ;; "infobar") disk+=" $(bar "$disk_perc" "100")" ;; "barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; - "perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; + "perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; esac # Append '(disk mount point)' to the subtitle. @@ -3153,7 +3153,7 @@ get_battery() { battery="${capacity}% [${status}]" case "$battery_display" in - "bar") battery="$(bar "$capacity" 100)" ;; + "bar") battery="$(bar "$capacity" 100)" ;; "infobar") battery+=" $(bar "$capacity" 100)" ;; "barinfo") battery="$(bar "$capacity" 100)${info_color} ${battery}" ;; esac @@ -3212,7 +3212,7 @@ get_battery() { [[ "$battery_state" ]] && battery+=" Charging" case "$battery_display" in - "bar") battery="$(bar "${battery/'%'*}" 100)" ;; + "bar") battery="$(bar "${battery/'%'*}" 100)" ;; "infobar") battery="${battery} $(bar "${battery/'%'*}" 100)" ;; "barinfo") battery="$(bar "${battery/'%'*}" 100)${info_color} ${battery}" ;; esac @@ -4359,8 +4359,6 @@ ASCII: --ascii_bold on/off Whether or not to bold the ascii logo. -L, --logo Hide the info text and only show the ascii logo. - Possible values: bar, infobar, barinfo, off - IMAGE: --loop Redraw the image constantly until Ctrl+C is used. This fixes issues in some terminals emulators when using image mode. From 108bb9cff94e01d19b939e7374d020fffb132eac Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 5 Jun 2018 07:40:29 +1000 Subject: [PATCH 3/5] os: add macOS codename for Mojave --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fa9466ff..9955d89a 100755 --- a/neofetch +++ b/neofetch @@ -940,6 +940,7 @@ get_distro() { "10.11"*) codename="OS X El Capitan" ;; "10.12"*) codename="macOS Sierra" ;; "10.13"*) codename="macOS High Sierra" ;; + "10.14"*) codename="macOS Mojave" ;; *) codename="macOS" ;; esac distro="$codename $osx_version $osx_build" @@ -950,7 +951,7 @@ get_distro() { case "$osx_version" in "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;; - "10.1"[2-3]*) distro="${distro/${codename}/macOS}" ;; + "10.1"[2-4]*) distro="${distro/${codename}/macOS}" ;; esac distro="${distro/ ${osx_build}}" ;; From edb960fecebed23e58f2b652de5fba9f69a079cb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 07:42:54 +1000 Subject: [PATCH 4/5] docs: update --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e829aa1c..459b274e 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ +

neofetch @@ -55,6 +56,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, ## Donate -Donations will allow me to spend more time working on `neofetch`. +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. + + -If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** From 6e41a62193aeed75fac8980f88a82cf4d767bbc7 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 5 Jun 2018 07:42:58 +1000 Subject: [PATCH 5/5] docs: update [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e60d1a3..7aa20380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - 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**