merge: fix conflicts

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**
 

README.md

@@ -7,6 +7,7 @@
 <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://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"></a>
+<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-green.svg"></a>
 </p>
 
 <img src="https://i.imgur.com/GFmC5Ad.png" alt="neofetch" align="right" height="240px">
@@ -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.
+
+<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-green.svg"></a> <a href="https://www.patreon.com/dyla"><img src="https://img.shields.io/badge/donate-patreon-yellow.svg"></a>
 
-If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla**

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}}"
                 ;;
@@ -1297,7 +1298,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")
@@ -2288,7 +2292,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
@@ -3122,10 +3126,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.
@@ -3150,7 +3154,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
@@ -3209,7 +3213,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
@@ -4356,7 +4360,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.
 
-
 IMAGE:
     --loop                      Redraw the image constantly until Ctrl+C is used. This fixes issues
                                 in some terminals emulators when using image mode.