Changeset 16

Timestamp:

May 17, 2014, 6:14:22 PM (11 years ago)

Author:

alloc

Message:

Minor cleanups

Location:

scripts/usr/local/bin

Files:

• 7dtd-common.sh (modified) (1 diff)
• 7dtd-instances.sh (modified) (2 diffs)
• 7dtd-running.sh (modified) (1 diff)
• 7dtd-start.sh (modified) (2 diffs)
• 7dtd-update.sh (modified) (1 diff)

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

@@ -91 +91 @@
 #   PID otherwise
 getInstancePID() {
-        run=$(isRunning $1)
-        if [ $run -eq 1 ]; then
+        if [ $(isRunning $1) -eq 1 ]; then
                 cat $(getInstancePath $1)/7dtd.pid
         else

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

@@ -14 +14 @@
         echo ${line// /-}
         for I in $(getInstanceList); do
-                run=$(isRunning $I)
-                if [ $run -eq 1 ]; then
+                if [ $(isRunning $I) -eq 1 ]; then
                         run="yes"
                         tel=$(telnetCommand $I lp)
@@ -44 +43 @@
         echo
 
-        res=$(isRunning $1)
-        if [ $res -eq 1 ]; then
+        if [ $(isRunning $1) -eq 1 ]; then
                 echo "Status: Running"
                 echo "Open ports:"

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

@@ -14 +14 @@
 checkInstanceValid $1
 
-res=$(isRunning $1)
-if [ $res -eq 1 ]; then
+if [ $(isRunning $1) -eq 1 ]; then
         echo "7dtd instance $1 is running"
         echo "Open ports:"

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

@@ -15 +15 @@
 checkInstanceValid $1
 
-res=$(isRunning $1)
-if [ $res -eq 0 ]; then
+if [ $(isRunning $1) -eq 0 ]; then
         if [ ! `pgrep Xvfb` ]; then
                 echo "Xvfb not yet running. Starting..."
@@ -31 +30 @@
         start-stop-daemon --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_ROOT --exec $WINE -- $SDTD_ROOT/7DaysToDie.exe $OPTS > $(getInstancePath $1)/stdout.log 2>&1
         sleep 1
-        res=$(isRunning $1)
-        if [ $res -eq 1 ]; then
+        if [ $(isRunning $1) -eq 1 ]; then
                 echo "Done!"
                 exit 0

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

@@ -5 +5 @@
 checkRootLoadConf
 
-for I in $SDTD_BASE/instances/*; do
-        ins=`basename $I`
-        run=$(isRunning $ins)
-        if [ $run -eq 1 ]; then
+for I in $(getInstanceList); do
+        if [ $(isRunning $I) -eq 1 ]; then
                 echo "At least one instance is still running."
                 echo "Before updating the engine please stop all instances!"