Changeset 7

Timestamp:

May 15, 2014, 8:01:58 PM (11 years ago)

Author:

alloc

Message:

Renamed ssd

Files:

• bootstrapper/bootstrap.sh (modified) (1 diff)
• bundle_creation/makefile (modified) (1 diff)
• scripts/etc/init.d/7dtd.sh (modified) (2 diffs)

bootstrapper/bootstrap.sh

@@ -5 +5 @@
 RUNINSTALL=0
 
-DEPENDENCIES="xvfb mono-runtime screen rsync libxml2-utils"
+DEPENDENCIES="xvfb mono-runtime rsync libxml2-utils"
 OPTDEPENDENCIES="sendemail sendxmpp"
 

bundle_creation/makefile

@@ -13 +13 @@
         @cp -r ../scripts/* .
 
-SSD: usr/local/bin/start-stop-daemon_nondeb
+SSD: usr/local/bin/start-stop-daemon
 
 # start-stop-daemon:
-usr/local/bin/start-stop-daemon_nondeb: ../tools/start-stop-daemon_nondeb/start-stop-daemon_nondeb.c
+usr/local/bin/start-stop-daemon: ../tools/start-stop-daemon_nondeb/start-stop-daemon.c
         @echo Compiling start-stop-daemon...
         @gcc -Wall -Wextra -Wno-return-type -Os -o $@ $<

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

@@ -16 +16 @@
 
 NAME="7DtD"
-SCREENREF="sdtd"
 BINARYPATH=$SDTD_ROOT
 USER=$SDTD_USER
@@ -39 +38 @@
             else
                 export DISPLAY=localhost:1.0
-                start-stop-daemon --start --pidfile $SDTD_ROOT/$PIDFILE --background --make-pidfile --chuid $USER --user $USER --chdir $BINARYPATH --exec "/usr/bin/screen" -- -D -m -S $SCREENREF $RUNTIME $BINARYPATH/$BINARYNAME $OPTS
+                start-stop-daemon --start --pidfile $SDTD_ROOT/$PIDFILE --background --no-close --make-pidfile --chuid $USER --user $USER --chdir $BINARYPATH --exec  -- -D -m -S $SCREENREF $RUNTIME $BINARYPATH/$BINARYNAME $OPTS
                 sleep 1
             fi