repo: music
action: commit
revision: 
path_from: 
revision_from: c1e1f97c68746246b296b1e4b69db1a3e8b26ac3:
path_to: 
revision_to: 

commit c1e1f97c68746246b296b1e4b69db1a3e8b26ac3
Author: epoch 
Date:   Thu Jul 30 08:23:49 2020 -0500

    updated paths to use a / after music instead of -

diff --git a/music-playlist b/music-playlist

--- a/music-playlist
+++ b/music-playlist
@@ -1,18 +1,17 @@
 #!/bin/sh
-mkdir -p "${PREFIX}/var/run"
-music_init_pid="${PREFIX}/var/run/music-init.pid"
+mkdir -p "${PREFIX}/run/music"
+music_init_pid="${PREFIX}/run/music/init.pid"
 if [ -f "${music_init_pid}" ];then
-  #pid file exists...
-  if [ "$(ps -h -o cmd -p $(cat ${PREFIX}/var/run/music-init.pid ))" = "qargs music-player" ];then
+  if [ "$(ps -h -o cmd -p "$(cat "${music_init_pid}")")" = "qargs music-player" ];then
     printf "already running.\n"
-    echo pid: "$(cat ${PREFIX}/var/run/music-init.pid)"
-    echo cmd: "$(ps -h -o cmd -p $(cat ${PREFIX}/var/run/music-init.pid))"
+    echo pid: "$(cat "${PREFIX}/run/music/init.pid")"
+    echo cmd: "$(ps -h -o cmd -p $(cat ${PREFIX}/run/music/init.pid))"
     exit 1
+  else
+    logger -p notice -n logserver 'stale music init pid most likely.'
   fi
-  printf "stale pid file: %s\n" "${music_init_pid}"
-  rm "${music_init_pid}"
 fi
-export "QARGS_CHILD_PIDFILE=${PREFIX}/var/run/music-player.pid"
+export "QARGS_CHILD_PIDFILE=${PREFIX}/run/music/player.pid"
 qargs music-player > $music_init_pid
-rm ${PREFIX}/var/cache/music-nowplaying.txt
+rm ${PREFIX}/var/cache/music/nowplaying.txt
 logger -p notice -n logserver 'ran out of music to play'

-----END OF PAGE-----