Merge branch 'master' of github.com:dylanaraps/neofetch

neofetch

@@ -774,7 +774,7 @@ get_os() {
     # $kernel_name is set in a function called cache_uname and is
     # just the output of "uname -s".
     case "$kernel_name" in
-        "Darwin"):   "$(sw_vers -productName)" ;;
+        "Darwin"):   "$darwin_name" ;;
         "SunOS"):    "Solaris" ;;
         "Haiku"):    "Haiku" ;;
         "MINIX"):    "MINIX" ;;
@@ -926,9 +926,6 @@ get_distro() {
         ;;
 
         "Mac OS X")
-            osx_version="$(sw_vers -productVersion)"
-            osx_build="$(sw_vers -buildVersion)"
-
             case "$osx_version" in
                 "10.4"*)  codename="Mac OS X Tiger" ;;
                 "10.5"*)  codename="Mac OS X Leopard" ;;
@@ -959,7 +956,7 @@ get_distro() {
         ;;
 
         "iPhone OS")
-            distro="iOS $(sw_vers -productVersion)"
+            distro="iOS $osx_version"
 
             # "uname -m" doesn't print architecture on iOS so we force it off.
             os_arch="off"
@@ -2372,6 +2369,8 @@ get_song() {
         "audacious"*)     get_song_dbus "audacious" ;;
         "vlc"*)           get_song_dbus "vlc" ;;
         "gmusicbrowser"*) get_song_dbus "gmusicbrowser" ;;
+        "pragha"*)        get_song_dbus "pragha" ;;
+        "amarok"*)        get_song_dbus "amarok" ;;
 
         "cmus"*)
             song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "};
@@ -2411,18 +2410,8 @@ get_song() {
                                END {print a " \n " b " \n "t}')"
         ;;
 
-        "amarok"*)
-            song="$(qdbus org.kde.amarok /Player GetMetadata |\
-                    awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2}
-                    END{print a " \n " b " \n " t}')"
-        ;;
-
-        "pragha"*)
-            song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
-                                END{print a " \n " b " \n " t}')"
-        ;;
-
         "exaile"*)
+            # NOTE: Exaile >= 4.0.0 will support mpris2.
             song="$(dbus-send --print-reply --dest=org.exaile.Exaile  /org/exaile/Exaile \
                     org.exaile.Exaile.Query |
                     awk -F':|,' '{if ($6 && $8 && $4) printf $6 " \n" $8 " \n" $4}')"
@@ -4161,6 +4150,14 @@ cache_uname() {
     kernel_name="${uname[0]}"
     kernel_version="${uname[1]}"
     kernel_machine="${uname[2]}"
+
+    if [[ "$kernel_name" == "Darwin" ]]; then
+        IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/string/ {print $3}' \
+                            "/System/Library/CoreServices/SystemVersion.plist")
+        darwin_name="${sw_vers[2]}"
+        osx_version="${sw_vers[3]}"
+        osx_build="${sw_vers[0]}"
+    fi
 }
 
 get_ppid() {