Changeset 18

Timestamp:

May 21, 2014, 7:16:53 PM (11 years ago)

Author:

alloc

Message:

Version 4

Location:

scripts

Files:

• etc/7dtd.conf (modified) (1 diff)
• etc/bash_completion.d/7dtd (modified) (1 diff)
• usr/local/lib/7dtd/commands/start.sh (modified) (2 diffs)
• usr/local/lib/7dtd/commands/stop.sh (modified) (1 diff)
• usr/local/lib/7dtd/monitor-log.sh (modified) (1 diff)

scripts/etc/7dtd.conf

@@ -21 +21 @@
 export WINE=/usr/bin/wine
 export XMLSTARLET=/usr/bin/xmlstarlet
+export PKILL=/usr/bin/pkill
+

scripts/etc/bash_completion.d/7dtd

@@ -1 +1 @@
 . /usr/local/lib/7dtd/common.sh
+checkRootLoadConf
 
 _sdtd() {

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

@@ -29 +29 @@
                 
                 setAllPlayersOffline $1
+                rm $SDTD_BASE/engine/7DaysToDie_Data/output_log.txt
                 
                 SSD_PID="--pidfile $(getInstancePath $1)/7dtd.pid --make-pidfile"
@@ -40 +41 @@
                         SSD_MONITOR_PID="--pidfile $(getInstancePath $1)/monitor.pid --make-pidfile"
                         SSD_MONITOR_DAEMON="--background"
-                        start-stop-daemon --start $SSD_PID $SSD_DAEMON --exec "/usr/local/lib/monitor-log.sh" -- "$1"
+                        start-stop-daemon --start $SSD_MONITOR_PID $SSD_MONITOR_DAEMON --exec "/usr/local/lib/7dtd/monitor-log.sh" -- "$1"
                         echo "Done!"
                 else

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

@@ -45 +45 @@
                 fi
 
-                start-stop-daemon --stop --pidfile $(getInstancePath $1)/monitor.pid
+                $PKILL -TERM -P $(cat $(getInstancePath $1)/monitor.pid)
                 rm $(getInstancePath $1)/monitor.pid
                 setAllPlayersOffline $1

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -47 +47 @@
 echo >> $LOG
 
+sleep 5
+
 NOBUF="stdbuf -e0 -o0"