Changeset 9 for scripts/usr

Timestamp:

May 15, 2014, 8:38:37 PM (11 years ago)

Author:

alloc

Message:

Fix #1, #2, #3, #5; Refs #4, #6: WD works for save path, not for some logs

Location:

scripts/usr/local/bin

Files:

• 7dtd-backup.sh (modified) (1 diff)
• 7dtd-check_mem.sh (deleted)
• 7dtd-common.sh (added)
• 7dtd-instances.sh (added)
• 7dtd-kill.sh (modified) (1 diff)
• 7dtd-running.sh (added)
• 7dtd-start.sh (modified) (1 diff)
• 7dtd-update.sh (modified) (3 diffs)

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

@@ -18 +18 @@
 fi
 
-$RSYNC -a --delete --numeric-ids --delete-excluded $SDTD_ROOT/Data/Worlds/./ $NewBackup
+$RSYNC -a --delete --numeric-ids --delete-excluded $SDTD_BASE/instances/./ $NewBackup
 touch $NewBackup
 

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

@@ -1 +1 @@
 #!/bin/bash
-/etc/init.d/7dtd.sh stop
+# Tries to stop the 7dtd instance given as first parameter.
+# Returns:
+#  0 : Done
+#  1 : Was not running
+#  2 : No instance name given
+#  3 : No such instance
+
+. /usr/local/bin/7dtd-common.sh
+checkRootLoadConf
+
+checkInstance $1
+
+res=$(isRunning $1)
+if [ $res -eq 1 ]; then
+        telnetCommand shutdown
+        start-stop-daemon --stop --pidfile $(getInstancePath $1)/7dtd.pid
+        rm $(getInstancePath $1)/7dtd.pid
+        echo "Done"     
+        exit 0
+else
+        echo "7dtd instance $1 is NOT running"
+        exit 1
+fi

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

@@ -1 +1 @@
 #!/bin/bash
-/etc/init.d/7dtd.sh start
+# Tries to start the 7dtd instance given as first parameter.
+# Returns:
+#  0 : Done
+#  1 : Was already running
+#  2 : No instance name given
+#  3 : No such instance
+#  5 : Unknown error when starting engine
+
+. /usr/local/bin/7dtd-common.sh
+checkRootLoadConf
+
+checkInstance $1
+
+res=$(isRunning $1)
+if [ $res -eq 0 ]; then
+        if [ ! `pgrep Xvfb` ]; then
+                echo "Xvfb not yet running. Starting..."
+                su -c "/usr/bin/Xvfb :1 -screen 0 640x480x16" $SDTD_USER &> /dev/null &
+                sleep 3
+        fi
+        export DISPLAY=localhost:1.0
+        
+        SSD_PID="--pidfile $(getInstancePath $1)/7dtd.pid --make-pidfile"
+        SSD_DAEMON="--background --no-close"
+        SSD_USER="--chuid $SDTD_USER:$SDTD_GROUP --user $SDTD_USER"
+        OPTS="-quit -batchmode -nographics -configfile=$(getInstancePath $1)/serverconfig.xml -dedicated"
+        
+        start-stop-daemon --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_ROOT --exec $WINE -- $SDTD_ROOT/7DaysToDie.exe $OPTS > $(getInstancePath $1)/stdout.log 2>&1
+        sleep 1
+        res=$(isRunning $1)
+        if [ $res -eq 1 ]; then
+                echo "Done!"
+                exit 0
+        else
+                echo "Failed!"
+                rm -f $(getInstancePath $1)/7dtd.pid
+                exit 5
+        fi
+else
+        echo "7dtd instance $1 is already running"
+        exit 1
+fi

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

@@ -1 +1 @@
 #!/bin/bash
-. /etc/7dtd.conf
+. /usr/local/bin/7dtd-common.sh
+checkRootLoadConf
+
+for I in $SDTD_BASE/instances/*; do
+        ins=`basename $I`
+        run=$(isRunning $ins)
+        if [ $run -eq 1 ]; then
+                echo "At least one instance is still running."
+                echo "Before updating the engine please stop all instances!"
+                exit 1
+        fi
+done
 
 if [ ! -e $STEAMCMD_ROOT ]; then
@@ -13 +24 @@
 cd $STEAMCMD_ROOT
 
-./steamcmd.sh +@sSteamCmdForcePlatformType windows +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_ROOT +app_update 251570 validate +quit
+./steamcmd.sh +@sSteamCmdForcePlatformType windows +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_ROOT "+app_update 251570" validate +quit
 chown $SDTD_USER.$SDTD_GROUP -R $SDTD_ROOT
 
@@ -19 +30 @@
 cp $SDTD_ROOT/Install/32bit/mono.dll $SDTD_ROOT/7DaysToDie_Data/Mono/
 cp $SDTD_ROOT/Install/32bit/SteamworksManaged.dll $SDTD_ROOT/7DaysToDie_Data/Managed/
-cp $SDTD_ROOT/../msvcr100.dll $SDTD_ROOT/
+cp $SDTD_BASE/msvcr100.dll $SDTD_ROOT/