kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dylan Araps 2018-06-09 17:23:07 +10:00
commit 329abc5c46
1 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
neofetch
View file

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