Changeset 481

Timestamp:

Nov 14, 2023, 2:48:08 PM (12 months ago)

Author:

alloc

Message:

Scripts

Location:

scripts/usr/local/lib/7dtd

Files:

• commands/instances.sh (modified) (1 diff)
• commands/start.sh (modified) (1 diff)
• commands/updateengine.sh (modified) (1 diff)
• common.sh (modified) (3 diffs)
• serverconfig.sh (modified) (2 diffs)

scripts/usr/local/lib/7dtd/commands/instances.sh

@@ -75 +75 @@
         
         $EDITOR $IPATH/config.xml
-        configSetAutoParameters "$INSTANCE"
         
         if [ -f "$SDTD_BASE/templates/admins.xml" ]; then

scripts/usr/local/lib/7dtd/commands/start.sh

@@ -56 +56 @@
                 SSD_DAEMON="--background --no-close"
                 SSD_USER="--chuid $SDTD_USER:$SDTD_GROUP --user $SDTD_USER"
-                OPTS="-logfile $LOG -nographics -configfile=$(getInstancePath $1)/config.xml"
+                OPTS="-logfile $LOG -nographics -configfile=$(getInstancePath $1)/config.xml -TelnetEnabled=true -AdminFileName=admins.xml -UserDataFolder=$(getInstancePath $1) "
                 
                 if [ "$(uname -m)" = "x86_64" ]; then

scripts/usr/local/lib/7dtd/commands/updateengine.sh

@@ -174 +174 @@
                         PASSWORDARG=-betapassword $BRANCHPASSWORD
                 fi
-                #echo ./steamcmd.sh +login anonymous +force_install_dir $SDTD_BASE/engine +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
-                ./steamcmd.sh +login anonymous +force_install_dir $SDTD_BASE/engine +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
+                #echo ./steamcmd.sh +force_install_dir $SDTD_BASE/engine +login anonymous +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
+                ./steamcmd.sh +force_install_dir $SDTD_BASE/engine +login anonymous +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
 
                 if [ -d /usr/local/lib/7dtd/server-fixes ]; then

scripts/usr/local/lib/7dtd/common.sh

@@ -120 +120 @@
                 local APPMANIFEST=$(find $SDTD_BASE/engine -type f -name "appmanifest_294420.acf")
                 if [ -f "$APPMANIFEST" ]; then
-                        LOCAL=$(grep betakey "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+                        LOCAL=$(grep -i '"betakey"' "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
                         if [[ -z $LOCAL ]]; then
                                 LOCAL="public"
@@ -141 +141 @@
                 local APPMANIFEST=$(find $SDTD_BASE/engine -type f -name "appmanifest_294420.acf")
                 if [ -f "$APPMANIFEST" ]; then
-                        LOCAL=$(grep buildid "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+                        LOCAL=$(grep -i '"buildid"' "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
                         if [ $(isANumber "$LOCAL") -eq 0 ]; then
                                 LOCAL=0
@@ -159 +159 @@
                 local APPMANIFEST=$(find $SDTD_BASE/engine -type f -name "appmanifest_294420.acf")
                 if [ -f "$APPMANIFEST" ]; then
-                        LOCAL=$(grep LastUpdated "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+                        LOCAL=$(grep -i '"LastUpdated"' "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
                         if [ $(isANumber "$LOCAL") -eq 0 ]; then
                                 LOCAL=0

scripts/usr/local/lib/7dtd/serverconfig.sh

@@ -20 +20 @@
 ## Generic worker functions
 
-
-# Set parameters for current instance that have forced values:
-#  - TelnetEnabled must be set so that management scripts can work
-#  - AdminFileName is made to point to the local instance admins.xml
-#  - SaveGameFolder is made to point to the instance folder
-#  - UserDataFolder (for GeneratedWorlds) is made to point to the <user home directory>/serverdata/
-# Params:
-#   1: Instance name
-configSetAutoParameters() {
-        setConfigValue "$1" "TelnetEnabled" "true"
-        setConfigValue "$1" "AdminFileName" "admins.xml"
-        setConfigValue "$1" "SaveGameFolder" "$(getInstancePath "$1")"
-        setConfigValue "$1" "UserDataFolder" "$SDTD_BASE/serverdata"
-}
 
 # Query for an instance name (will be saved in $INSTANCE)
@@ -78 +64 @@
 #   3: New value
 setConfigValue() {
+        local XMLSTARLET_OPTS="-L -P"
         local CONF=$(getInstancePath $1)/config.xml
-        $XMLSTARLET ed -L -u "/ServerSettings/property[@name='$2']/@value" -v "$3" $CONF
+        local XPATHBASE="//property[@name='$2']"
+        
+        if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@name" $CONF) ]; then
+                $XMLSTARLET ed $XMLSTARLET_OPTS \
+                        -s "/*[1]" -t elem -n "property" \
+                        -i "//property[not(@name)]" -t attr -n "name" -v "$2" \
+                        -i "$XPATHBASE" -t attr -n "value" -v "$3" \
+                        $CONF
+        else
+                $XMLSTARLET ed $XMLSTARLET_OPTS -u "$XPATHBASE/@value" -v "$3" $CONF
+        fi
 }