Merge branch 'master' of github.com:dylanaraps/neofetch
This commit is contained in:
commit
e857b6cee5
12
neofetch
12
neofetch
|
@ -1180,7 +1180,7 @@ getsong () {
|
|||
song="$(mocp -Q "%artist - %song" 2>/dev/null)"
|
||||
state="$(mocp -Q "%state" 2>/dev/null)"
|
||||
|
||||
elif pgrep "spotify" >/dev/null 2>&1; then
|
||||
elif [ -n "$(ps aux | awk '!(/awk/) && /spotify/')" ]; then
|
||||
case "$os" in
|
||||
"Linux")
|
||||
# This command is way too long
|
||||
|
@ -1194,15 +1194,17 @@ getsong () {
|
|||
song=${song/'('*}
|
||||
song=${song//'['*}
|
||||
;;
|
||||
|
||||
"Mac OS X")
|
||||
song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')"
|
||||
state="$(osascript -e 'tell application "Spotify" to player state as string')"
|
||||
;;
|
||||
esac
|
||||
|
||||
elif [ -n "$(ps aux | awk '!(/awk/ || /Helper/) && /iTunes/')" ]; then
|
||||
song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " name of current track as string')"
|
||||
state="$(osascript -e 'tell application "iTunes" to player state as string')"
|
||||
|
||||
elif [ -n "$(ps aux | awk '!(/awk/) && /spotify/')" ]; then
|
||||
song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')"
|
||||
state="$(osascript -e 'tell application "Spotify" to player state as string')"
|
||||
|
||||
else
|
||||
song="Unknown"
|
||||
fi
|
||||
|
|
Reference in New Issue