From 48120fbbb4f2b46e44c92d09f90a244717b1812d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 30 Sep 2017 23:39:43 +0200 Subject: Fix mpd and usbkey --- config/i3blocks/scripts/mpd | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'config/i3blocks/scripts/mpd') diff --git a/config/i3blocks/scripts/mpd b/config/i3blocks/scripts/mpd index 113f6e8..12f0fdd 100755 --- a/config/i3blocks/scripts/mpd +++ b/config/i3blocks/scripts/mpd @@ -1,14 +1,16 @@ #!/bin/bash -HOME="192.168.0.217" -HOST="" +HOST_HOME="192.168.0.51" +HOST="" # Let's be sneaky and verify that we are on relevant network before we try to ping if ip a | grep -q 'inet 192.168.0.' && \ - ping -c 1 -w 1 "$HOME" >/dev/null 2>&1; then + ping -c 1 -w 1 "$HOST_HOME" >/dev/null 2>&1; then # TODO check that mpd is running? - HOST="-h $HOME" + HOST="-h $HOST_HOME" fi +STATUS="$(mpc $HOST status)" + # Handle remote volume if [ "$BLOCK_INSTANCE" = "remote" ]; then [ -n "$HOST" ] || exit 0 @@ -27,7 +29,9 @@ if [ "$BLOCK_INSTANCE" = "remote" ]; then ;; esac - echo "♫ $(mpc $HOST volume | sed 's/volume: //')" + if echo "$STATUS" | grep -qE "(playing|paused)"; then + echo "♫ $(mpc $HOST volume | sed 's/volume: //')" + fi exit 0 fi @@ -40,8 +44,7 @@ case "$BLOCK_BUTTON" in mpc $HOST stop >/dev/null ;; 3) - # TODO this doesn't work with host - nohup urxvt -title "Music player daemon client" -hold -e ncmpcpp 2>&1 >/dev/null & + nohup urxvt -title "Music player daemon client" -e ncmpcpp $HOST 2>&1 >/dev/null & ;; 4) mpc $HOST prev >/dev/null -- cgit v1.2.3