Changeset 25

Timestamp:

May 27, 2014, 10:32:48 AM (11 years ago)

Author:

alloc

Message:

Version 8: start-stop-daemon location by variable

Files:

• bundle_creation/makefile (modified) (1 diff)
• scripts/etc/7dtd.conf (modified) (1 diff)
• scripts/usr/local/lib/7dtd/VERSION (modified) (1 diff)
• scripts/usr/local/lib/7dtd/commands/start.sh (modified) (2 diffs)
• scripts/usr/local/lib/7dtd/commands/stop.sh (modified) (1 diff)
• scripts/usr/local/lib/7dtd/common.sh (modified) (1 diff)
• tools/start-stop-daemon/makefile (modified) (1 diff)

bundle_creation/makefile

@@ -13 +13 @@
         @cp -r ../scripts/* .
 
-SSD: usr/local/bin/start-stop-daemon
-
-# start-stop-daemon:
-usr/local/bin/start-stop-daemon: ../tools/start-stop-daemon/start-stop-daemon.c
-        @echo Compiling start-stop-daemon...
-        @gcc -Wall -Wextra -Wno-return-type -Os -o $@ $<
+SSD:
+        @echo Copying start-stop-daemon source...
+        @find ../tools -name "*~" -exec rm {} \;
+        @cp -r ../tools/start-stop-daemon usr/local/lib/7dtd
 
 clean:

scripts/etc/7dtd.conf

@@ -21 +21 @@
 export XMLSTARLET=/usr/bin/xmlstarlet
 export PKILL=/usr/bin/pkill
+export SSD=/sbin/start-stop-daemon
 

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

@@ -1 @@
-Current version:        7
-Last edit:      2014-05-26
+Current version:        8
+Last edit:      2014-05-27

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

@@ -39 +39 @@
                 OPTS="-quit -batchmode -nographics -configfile=$(getInstancePath $1)/config.xml -dedicated"
                 
-                start-stop-daemon --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $WINE -- $SDTD_BASE/engine/7DaysToDie.exe $OPTS > $(getInstancePath $1)/stdout.log 2>&1
+                $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $WINE -- $SDTD_BASE/engine/7DaysToDie.exe $OPTS > $(getInstancePath $1)/stdout.log 2>&1
                 sleep 1
 
@@ -49 +49 @@
                         SSD_MONITOR_PID="--pidfile $(getInstancePath $1)/monitor.pid --make-pidfile"
                         SSD_MONITOR_DAEMON="--background"
-                        start-stop-daemon --start $SSD_MONITOR_PID $SSD_MONITOR_DAEMON --exec "/usr/local/lib/7dtd/monitor-log.sh" -- "$1"
+                        $SSD --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 @@
                 if [ $(isRunning $1) -eq 1 ]; then
                         echo "Failed, force closing server..."
-                        start-stop-daemon --stop --pidfile $(getInstancePath $1)/7dtd.pid
+                        $SSD --stop --pidfile $(getInstancePath $1)/7dtd.pid
                 fi
 

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

@@ -61 +61 @@
 #   1 = running
 isRunning() {
-        start-stop-daemon --status --pidfile $(getInstancePath $1)/7dtd.pid
+        $SSD --status --pidfile $(getInstancePath $1)/7dtd.pid
         if [ $? -eq 0 ]; then
                 echo 1

tools/start-stop-daemon/makefile

@@ -2 +2 @@
         gcc -Wall -Wextra -Wno-return-type -o $@ $<
 
+install: start-stop-daemon
+        chown root.root start-stop-daemon
+        chmod 0755 start-stop-daemon
+
 clean:
         rm start-stop-daemon