Changeset 14 for scripts/usr/local/bin/7dtd-common.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-common.sh (modified) (4 diffs)

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

@@ -1 +1 @@
 #!/bin/bash
-# Version 2
+# Version 3
 
 # Provides common functions for 7dtd-scripts. Not intended to be run directly.
@@ -23 +23 @@
 
 # Check if the given instance name is an existing instance
-# On failure exit the script!
 # Params:
 #   1: Instance name
-checkInstance() {
+# Returns:
+#   0/1 instance not valid/valid
+isValidInstance() {
         if [ -z $1 ]; then
-                echo "No instance given!"
-                exit 2
+                echo 0
+        else
+                if [ ! -d $(getInstancePath $1) ]; then
+                        echo 0
+                else
+                        if [ ! -f $(getInstancePath $1)/config.xml ]; then
+                                echo 0
+                        else
+                                echo 1
+                        fi
+                fi
         fi
-        if [ ! -d $(getInstancePath $1) ]; then
-                echo "Instance $1 does not exist!"
-                exit 3
+}
+
+# Check if the given instance is valid, exit the script otherwise
+# Params:
+#   1: instance name
+checkInstanceValid() {
+        if [ -z $1 ]; then
+                echo "Missing parameter <instance>"
+                exit 1
+        fi
+        if [ $(isValidInstance $1) -eq 0 ]; then
+                echo "'$1' is not a valid instance"
+                exit 1
         fi
 }
@@ -50 +70 @@
                 echo 0
         fi
+}
+
+# Get list of defined instances
+# Returns:
+#   List of instances
+getInstanceList() {
+        for IF in $SDTD_BASE/instances/*; do
+                I=`basename $IF`
+                if [ $(isValidInstance $I) -eq 1 ]; then
+                        echo $I
+                fi
+        done
 }
 
@@ -74 +106 @@
 #   Property value
 getConfigValue() {
-        CONF=$(getInstancePath $1)/serverconfig.xml
-        xmllint --xpath "string(/ServerSettings/property[@name='$2']/@value)" $CONF
+        CONF=$(getInstancePath $1)/config.xml
+        xmlstarlet sel -t -v "/ServerSettings/property[@name='$2']/@value" $CONF
 }