Changeset 24 for scripts/usr/local/lib/7dtd/serverconfig.sh

Timestamp:

May 26, 2014, 2:29:53 PM (10 years ago)

Author:

alloc

Message:

Version 7: Added 'instances print_config <instance>'

File:

• scripts/usr/local/lib/7dtd/serverconfig.sh (modified) (13 diffs)

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

@@ -698 +698 @@
                         DisableNAT \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -719 +718 @@
                         echo
                 fi
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -733 +731 @@
                         GameName GameWorld GameMode \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -747 +744 @@
                         DayCount FragLimit MatchLength RebuildMap \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -762 +758 @@
                         BlockDurabilityModifier \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -777 +772 @@
                         LootAbundance LootRespawnDays AirDropFrequency \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -792 +786 @@
                         DayNightLength NightPercentage \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -807 +800 @@
                         PlayerDamageGiven PlayerDamageRecieved EnemySenseMemory EnemySpawnMode EnemyDifficulty \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -822 +814 @@
                         LandClaimOnlineDurabilityModifier LandClaimOfflineDurabilityModifier \
                         ; do
-                configQueryValue $CV
-                echo
+                $1 $CV
         done
         echo
@@ -829 +820 @@
 
 configEditAll() {
-        configEditServer
-        configEditRemoteControl
-        configEditGameType
-        configEditGameTypeSpecific
-        configEditGeneric
-        configEditDropLoot
-        configEditTimes
-        configEditDifficulty
-        configEditLandClaim
+        configEditServer "$1"
+        configEditRemoteControl "$1"
+        configEditGameType "$1"
+        configEditGameTypeSpecific "$1"
+        configEditGeneric "$1"
+        configEditDropLoot "$1"
+        configEditTimes "$1"
+        configEditDifficulty "$1"
+        configEditLandClaim "$1"
 }
 
@@ -990 +981 @@
         fi
         prompt=$(printf "%s:" "$prompt")
-        prompt=$(printf "%-*s " 35 "$prompt")
+        prompt=$(printf "%-*s " 40 "$prompt")
 
         while : ; do
@@ -1006 +997 @@
                 export $currentValName="${config_allowed_values[$currentValName-1]}"
         fi
+        echo
 }
 
@@ -1021 +1013 @@
 
 
-# Print currently defined config values
-printCurrentConfig() {
-        local CV
-        for CV in $(listConfigValues); do
-                local currentValName=configCurrent_$CV
-                printf "%-20s = %s\n" "$CV" "${!currentValName}"
-        done
+# Print defined config value
+# Params:
+#   1: Config option
+printConfigValue() {
+        local currentValName=configCurrent_$1
+        printf "%-25s = %s\n" "$(serverconfig_$1_QueryName)" "${!currentValName}"
 }