put statusfile into /tmp

svn path=/trunk/; revision=135

diff --git a/actions/playctl.sh b/actions/playctl.sh
index 183bee6fe0cb2ff6d1acc12ce41cdfd564801a6a..b532e36dfd28202667cb2d02dc490ae1175caad8 100755 (executable)
--- a/actions/playctl.sh
+++ b/actions/playctl.sh
@@ -18,6 +18,7 @@
 
 fifofile="${_DATA}/mplayer.fifo"
 statusfile="${_DATA}/mplayer.status"
+statusfile="/tmp/mplayer.status"
 volfile="${_DATA}/mplayer.volume"
 
 printf '\rBREAK\r' >> "$statusfile"

diff --git a/actions/watch.sh b/actions/watch.sh
index 48f465f84e3d0494799f279c6cc3d412526183e8..e473ac4755d1479bb537272e2972090546effc8a 100755 (executable)
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -59,6 +59,7 @@ case "${_COOKIE[watch]}" in
     playmeta="${_DATA}/mplayer.meta"
     fifofile="${_DATA}/mplayer.fifo"
     statusfile="${_DATA}/mplayer.status"
+    statusfile="/tmp/mplayer.status"
     volume="$(validate "$(cat "${_DATA}/mplayer.volume")" '[1-9]?[0-9]|100' 20)"
     [ \! -p "$fifofile" ] && rm -f "$fifofile" && mkfifo -m 600 "$fifofile"
 
@@ -86,6 +87,8 @@ case "${_COOKIE[watch]}" in
     #   --volume="$volume" \
     #   "$playuri" >"$statusfile" 2>/dev/null &
 
+    chmod 600 "$statusfile"
+
     redirect "?p=playctl&${watch_link}"
   ;;
   *) redirect "?p=view&${watch_link}"

diff --git a/pages/playctl.sh b/pages/playctl.sh
index 79122fd00d9f4f5ea370abdc33ec4b3883b471b3..c57e338bea556bcf2f9b866cc8a9d7f239be6aa8 100755 (executable)
--- a/pages/playctl.sh
+++ b/pages/playctl.sh
@@ -23,6 +23,7 @@ info="${_GET[i]}"
 location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
 directory="${location%/*}"
 statusfile="$_DATA/mplayer.status"
+statusfile="/tmp/mplayer.status"
 
 [ -n "$info" ] && video="${_DATA}/videos/$info" \
                || video="${treeroot%/}/${location#/}"