Changeset 17

Timestamp:

May 21, 2014, 6:31:05 PM (11 years ago)

Author:

alloc

Message:

Version 4

Location:

scripts

Files:

• etc/7dtd.conf (modified) (3 diffs)
• etc/bash_completion.d (added)
• etc/bash_completion.d/7dtd (added)
• etc/init.d/7dtd.sh (modified) (2 diffs)
• usr/local/bin/7dtd-backup.sh (deleted)
• usr/local/bin/7dtd-common.sh (deleted)
• usr/local/bin/7dtd-instances.sh (deleted)
• usr/local/bin/7dtd-kill.sh (deleted)
• usr/local/bin/7dtd-running.sh (deleted)
• usr/local/bin/7dtd-start.sh (deleted)
• usr/local/bin/7dtd-update.sh (deleted)
• usr/local/bin/7dtd.sh (added)
• usr/local/lib (added)
• usr/local/lib/7dtd (added)
• usr/local/lib/7dtd/commands (added)
• usr/local/lib/7dtd/commands/backup.sh (added)
• usr/local/lib/7dtd/commands/instances.sh (added)
• usr/local/lib/7dtd/commands/start.sh (added)
• usr/local/lib/7dtd/commands/status.sh (added)
• usr/local/lib/7dtd/commands/stop.sh (added)
• usr/local/lib/7dtd/commands/updateengine.sh (added)
• usr/local/lib/7dtd/common.sh (added)
• usr/local/lib/7dtd/help.sh (added)
• usr/local/lib/7dtd/monitor-log.sh (added)
• usr/local/lib/7dtd/playerlog.sh (added)

scripts/etc/7dtd.conf

@@ -1 +1 @@
 #!/bin/sh
-# Version 1
+# Version 4
 
 # Root directory where steamcmd should be placed
@@ -7 +7 @@
 export STEAM_PASS=
 
-# Root directory of the engine
-export SDTD_ROOT=/home/sdtd/7dtd
-
-# Root of the 7dtd folders, containing e.g. the "instances" folder
+# Root of the 7dtd folders, containing e.g. the "engine", "instances" folders
 export SDTD_BASE=/home/sdtd
 
@@ -21 +18 @@
 
 # Paths to binaries. Use "which BINARYNAME" to find the path of a single binary
-export CP=/bin/cp
 export RSYNC=/usr/bin/rsync
-export DU=/usr/bin/du
-export FREE=/usr/bin/free
-export AWK=/usr/bin/awk
-export PIDOF=/bin/pidof
 export WINE=/usr/bin/wine
+export XMLSTARLET=/usr/bin/xmlstarlet

scripts/etc/init.d/7dtd.sh

@@ -1 +1 @@
 #!/bin/sh
-# Version 3
+# Version 4
 
 ### BEGIN INIT INFO
@@ -14 +14 @@
 ### END INIT INFO
 
-. /usr/local/bin/7dtd-common.sh
-checkRootLoadConf
-
 case "$1" in
     start)
-        echo "Starting all 7dtd instances:"
-        for I in $(getInstanceList); do
-            echo "Starting: $I"
-            /usr/local/bin/7dtd-start.sh $I
-        done
-        echo "All done"
+        /usr/local/bin/7dtd.sh start "!"
     ;;
     stop)
-        echo "Stopping all 7dtd instances:"
-        for I in $(getInstanceList); do
-            echo "Stopping: $I"
-            /usr/local/bin/7dtd-kill.sh $I
-            echo
-            echo
-        done
-        echo "All done"
+        /usr/local/bin/7dtd.sh kill "!"
     ;;
     status)
-        /usr/local/bin/7dtd-instances.sh
+        /usr/local/bin/7dtd.sh instances
     ;;
     *)