Changeset 11

Timestamp:

May 15, 2014, 8:49:17 PM (11 years ago)

Author:

alloc

Message:

Fix for instances/kill

Location:

scripts/usr/local/bin

Files:

• 7dtd-instances.sh (modified) (2 diffs)
• 7dtd-kill.sh (modified) (1 diff)

scripts/usr/local/bin/7dtd-instances.sh

@@ -5 +5 @@
 # Returns:
 #  0
+
 . /usr/local/bin/7dtd-common.sh
 checkRootLoadConf
@@ -16 +17 @@
         if [ $run -eq 1 ]; then
                 run="yes"
+                tel=$(telnetCommand $ins lp)
+                cur=`echo $tel | sed "s/\r/\n/g" | sed "s/^ //g" | grep "Total of " | cut -d\  -f 3`
         else
                 run="no"
+                cur=0
         fi
 
-        tel=$(telnetCommand $ins lp)
         max=$(getConfigValue $ins ServerMaxPlayerCount)
-        cur=`echo $tel | sed "s/\r/\n/g" | sed "s/^ //g" | grep "Total of " | cut -d\  -f 3`
         
         printf "%-*s | %*s |   %2d/%2d\n" 20 "$ins" 8 "$run" $cur $max

scripts/usr/local/bin/7dtd-kill.sh

@@ -16 +16 @@
 res=$(isRunning $1)
 if [ $res -eq 1 ]; then
-        telnetCommand shutdown
-        start-stop-daemon --stop --pidfile $(getInstancePath $1)/7dtd.pid
+        telnetCommand $1 shutdown
+        sleep 1
+        res=$(isRunning $1)
+        if [ $res -eq 1 ]; then
+                start-stop-daemon --stop --pidfile $(getInstancePath $1)/7dtd.pid
+        fi
         rm $(getInstancePath $1)/7dtd.pid
         echo "Done"