Changeset 14 for scripts/usr/local/bin/7dtd-instances.sh

Timestamp:

May 17, 2014, 6:01:31 PM (11 years ago)

Author:

alloc

Message:

More instance validation, switch to XMLStarlet, config.xml instead of serverconfig.xml, admins.xml instead of serveradmin.xml

File:

• scripts/usr/local/bin/7dtd-instances.sh (modified) (3 diffs)

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

@@ -1 +1 @@
 #!/bin/bash
-# Version 2
+# Version 3
 
 # Lists available 7dtd instances.
@@ -13 +13 @@
         printf -v line "%*s-+-%*s-+-%*s-+-%*s\n" 20 " " 8 " " 7 " " 5 " "
         echo ${line// /-}
-        for I in $SDTD_BASE/instances/*; do
-                ins=`basename $I`
-                run=$(isRunning $ins)
+        for I in $(getInstanceList); do
+                run=$(isRunning $I)
                 if [ $run -eq 1 ]; then
                         run="yes"
-                        tel=$(telnetCommand $ins lp)
+                        tel=$(telnetCommand $I lp)
                         cur=`echo $tel | sed "s/\r/\n/g" | sed "s/^ //g" | grep "Total of " | cut -d\  -f 3`
                 else
                         run="no"
-                        cur=0
+                        cur="-"
                 fi
 
-                max=$(getConfigValue $ins ServerMaxPlayerCount)
-                port=$(getConfigValue $ins ServerPort)
+                max=$(getConfigValue $I ServerMaxPlayerCount)
+                port=$(getConfigValue $I ServerPort)
 
-                printf "%-*s | %*s |   %2d/%2d | %5d\n" 20 "$ins" 8 "$run" $cur $max $port
+                printf "%-*s | %*s |   %2s/%2d | %5d\n" 20 "$I" 8 "$run" $cur $max $port
         done
         exit 0
@@ -34 +33 @@
 
 showInfo() {
-        if [ -z $1 ]; then
-                echo "Missing parameter <instance>"
-                exit 1
-        fi
-        checkInstance $1
+        checkInstanceValid $1
 
         line() {