Changeset 259 for scripts/usr/local/lib/7dtd/commands

Timestamp:

Mar 17, 2016, 6:16:40 PM (9 years ago)

Author:

alloc

Message:

v96

Location:

scripts/usr/local/lib/7dtd/commands

Files:

• start.sh (modified) (2 diffs)
• stop.sh (modified) (2 diffs)

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

@@ -47 +47 @@
                 rm -f $(getInstancePath $1)/logs/output_log.txt
                 
-                for H in $(getHooksFor serverPreStart); do
+                for H in $(getHooksFor serverPreStart $1); do
                         $H $1
                 done
@@ -58 +58 @@
                 OPTS="-logfile $LOG -configfile=$(getInstancePath $1)/config.xml"
                 
-                LC_ALL=C LD_LIBRARY_PATH=$SDTD_BASE/engine $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $SDTD_BASE/engine/7DaysToDieServer.x86 -- $OPTS > $(getInstancePath $1)/logs/stdout.log 2>&1
+#               if [ "$(uname -m)" = "x86_64" ]; then
+#                       SERVER_EXE="7DaysToDieServer.x86_64"
+#               else
+                        SERVER_EXE="7DaysToDieServer.x86"
+#               fi
+
+                
+                LC_ALL=C LD_LIBRARY_PATH=$SDTD_BASE/engine $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $SDTD_BASE/engine/$SERVER_EXE -- $OPTS > $(getInstancePath $1)/logs/stdout.log 2>&1
                 sleep 1
 
-                for H in $(getHooksFor serverPostStart); do
+                for H in $(getHooksFor serverPostStart $1); do
                         $H $1
                 done

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

@@ -42 +42 @@
         res=$(isRunning $1)
         if [ $res -eq 1 ]; then
-                for H in $(getHooksFor serverPreStop); do
+                for H in $(getHooksFor serverPreStop $1); do
                         $H $1
                 done
@@ -68 +68 @@
                 rm $(getInstancePath $1)/7dtd.pid
 
-                for H in $(getHooksFor serverPostStop); do
+                for H in $(getHooksFor serverPostStop $1); do
                         $H $1
                 done