X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=bin%2Fbrisk-init.sh;h=f816cb4abdfccca6ffc8dad70c4924425137f1cb;hb=HEAD;hp=a6aee763dd25236110fc1a905a68b940e1244928;hpb=4134ca0a411ba95acb7e5bda7632df30cd91eafc;p=brisk.git

diff --git a/bin/brisk-init.sh b/bin/brisk-init.sh
index a6aee76..f816cb4 100755
--- a/bin/brisk-init.sh
+++ b/bin/brisk-init.sh
@@ -30,24 +30,29 @@ case "$1" in
         #
         #  if .pid file exists try to shutdown the process
         if [ -f "${PPATH}/brisk.pid" ]; then
-            pid_old="$(cat "${PPATH}/brisk.pid")"
-            kill -TERM $pid_old
             killed=0
+            pid_old="$(cat "${PPATH}/brisk.pid")"
+            sig="TERM"
             for i in $(seq 1 $WAITLOOP_MAX); do
                 sleep 1
-                if ! kill -0 $pid_old 2>/dev/null ; then
+                if ! kill -$sig $pid_old 2>/dev/null ; then
                     killed=1
                     break
                 fi
+                sig=0
             done
             if [ $killed -eq 0 ]; then
-                kill -KILL $pid_old 2>/dev/null
+                kill -KILL $pid_old 2>/dev/null || true
             fi
         fi
         ;;
 
+    devstart)
+        su - ${BUSER} -c 'cd '"$BPATH"'/spush ; ./brisk-spush.php'
+        ;;
+
     start)
-        su - ${BUSER} -c 'cd '"$BPATH"'/spush ; screen -d -m -S '"${SSUFF}"' bash -c '"'"'while [ 1 ]; do ./brisk-spush.php \| grep "IN LOOP" ; if [ $? -eq 0 ]; then break ; fi ; done'"'"
+        su - ${BUSER} -c 'cd '"$BPATH"'/spush ; screen -d -m -S '"${SSUFF}"' bash -c '"'"'while [ 1 ]; do cd . ; ./brisk-spush.php \| grep "IN LOOP" ; if [ $? -eq 0 ]; then break ; fi ; done'"'"
         ;;
     restart)
         $0 stop