Merge pull request #269 from iandrewt/gpmdp-remote-migration

migrate from gpmdp to gpmdp-remote
This commit is contained in:
Dylan Araps 2016-06-01 21:06:52 +10:00
commit 0e4c74e913

View file

@ -12,7 +12,7 @@
# Desktop Environment and Window Manager: xprop # Desktop Environment and Window Manager: xprop
# Displaying Images: w3m + w3m-img # Displaying Images: w3m + w3m-img
# Image Cropping: ImageMagick # Image Cropping: ImageMagick
# Displaying song with Google Play Music: gpmdp-bash # Displaying song with Google Play Music: gpmdp-remote
# [ Linux / BSD ] Wallpaper Display: feh, nitrogen or gsettings # [ Linux / BSD ] Wallpaper Display: feh, nitrogen or gsettings
# [ Linux / BSD ] Current Song: mpc, cmus, moc # [ Linux / BSD ] Current Song: mpc, cmus, moc
# [ Linux ] Current Song: spotify # [ Linux ] Current Song: spotify
@ -1484,9 +1484,9 @@ getsong () {
;; ;;
esac esac
elif [ -n "$(ps x | awk '!(/awk/ || /Helper/) && /Google Play Music Desktop Player/')" ] && type -p gpmdp >/dev/null 2>&1; then elif [ -n "$(ps x | awk '!(/awk/ || /Helper/) && /Google Play Music Desktop Player/')" ] && type -p gpmdp-remote >/dev/null 2>&1; then
song="$(gpmdp current)" song="$(gpmdp-remote current)"
state="$(gpmdp status)" state="$(gpmdp-remote status)"
elif [ -n "$(ps x | awk '!(/awk/ || /Helper/) && /iTunes/')" ]; then elif [ -n "$(ps x | 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')"