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

Merge pull request #142 from dylanaraps/song_fixes

Browse source 
Remove duplicate pgrep lines in getsong
This commit is contained in:
Dylan Araps 2016-03-13 09:34:50 +11:00
commit f08ea4f0a8
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
neofetch
View file

@ -1180,7 +1180,7 @@ getsong () {
song="$(mocp -Q "%artist - %song" 2>/dev/null)" song="$(mocp -Q "%artist - %song" 2>/dev/null)"
state="$(mocp -Q "%state" 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 case "$os" in
"Linux") "Linux")
# This command is way too long # This command is way too long
@ -1194,15 +1194,17 @@ getsong () {
song=${song/'('*} song=${song/'('*}
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 esac
elif [ -n "$(ps aux | awk '!(/awk/ || /Helper/) && /iTunes/')" ]; then 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')" 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')" 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 else
song="Unknown" song="Unknown"
fi fi