Changeset 502 for scripts

Timestamp:

Jan 13, 2025, 3:21:51 PM (41 hours ago)

Author:

alloc

Message:

118: Fixed error when trying to edit instances without EDITOR set

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• commands/backup.sh (modified) (1 diff)
• commands/instances.sh (modified) (2 diffs)

scripts/usr/local/lib/7dtd/VERSION

@@ -1 @@
-Version: 116
-Release: 2024-07-23
+Version: 118
+Release: 2025-01-13
 

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

@@ -58 +58 @@
         done
 
-        $RSYNC -a --delete --numeric-ids --delete-excluded $SDTD_BASE/instances/./ $NewBackup
+        $RSYNC -a --delete --numeric-ids --delete-excluded -F $SDTD_BASE/instances/./ $NewBackup
         touch $NewBackup
         

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

@@ -78 +78 @@
                 cp $SDTD_BASE/engine/serverconfig.xml $IPATH/config.xml
         fi
-        
-        $EDITOR $IPATH/config.xml
-        
+
+        if [ -z "$EDITOR" ]; then
+                echo "No EDITOR specified in the global configuration file (7dtd.conf)!"
+                echo "Please add/edit the variable 'EDITOR' and set it to the text editor you would"
+                echo "like to use to edit the XML configs, preferably an editor that supports XML"
+                echo "syntax highlighting for easier editing."
+                echo "Run '7dtd.sh instances edit $INSTANCE' afterwards to edit the configuration."
+                echo
+        else
+                $EDITOR $IPATH/config.xml
+        fi
+
         if [ -f "$SDTD_BASE/templates/admins.xml" ]; then
                 cp "$SDTD_BASE/templates/admins.xml" "$IPATH/"
@@ -89 +98 @@
 
 sdtdSubcommandInstancesEdit() {
+        if [ -z "$EDITOR" ]; then
+                echo "No EDITOR specified in the global configuration file (7dtd.conf)!"
+                echo "Please add/edit the variable 'EDITOR' and set it to the text editor you would"
+                echo "like to use to edit the XML configs, preferably an editor that supports XML"
+                echo "syntax highlighting for easier editing."
+                return
+        fi
+        
         if [ $(isValidInstance "$1") -eq 0 ]; then
                 echo "No instance given or not a valid instance!"