Changeset 259 for scripts

Timestamp:

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

Author:

alloc

Message:

v96

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• commands/start.sh (modified) (2 diffs)
• commands/stop.sh (modified) (2 diffs)
• common.sh (modified) (1 diff)
• monitor-log.sh (modified) (5 diffs)

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

@@ -1 @@
-Version: 95
-Release: 2016-02-16
+Version: 96
+Release: 2016-03-17
 

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

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

@@ -229 +229 @@
 # Params:
 #   1: Hook name
+#   2: Instance name
 # Returns:
 #   Names of hook files
 getHooksFor() {
+        if [ -n $2 ]; then
+                if [ -d $SDTD_BASE/$(getInstancePath $2)/hooks/$1 ]; then
+                        local H
+                        for H in $SDTD_BASE/$(getInstancePath $2)/hooks/$1/*.sh; do
+                                echo "$H"
+                        done
+                fi
+        fi
         if [ -d $SDTD_BASE/hooks/$1 ]; then
                 local H

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

@@ -42 +42 @@
         logPlayerConnect $INSTANCE "$entityId" "$name" "$steamId" "$ip"
 
-        for H in $(getHooksFor playerConnect); do
+        for H in $(getHooksFor playerConnect $INSTANCE); do
                 $H $INSTANCE "$entityId" "$name" "$steamId" "$ip"
         done
@@ -53 +53 @@
         logPlayerDisconnect $INSTANCE "$entityId"
 
-        for H in $(getHooksFor playerDisconnect); do
+        for H in $(getHooksFor playerDisconnect $INSTANCE); do
                 $H $INSTANCE "$playerId" "$entityId" "$NICKNAME" "$STEAMID"
         done
@@ -61 +61 @@
         echo "$(timestamp): $1" >> $CHATLOG
         
-        for H in $(getHooksFor chat); do
+        for H in $(getHooksFor chat $INSTANCE); do
                 $H $INSTANCE "$1"
         done
@@ -72 +72 @@
         echo "$(timestamp): Player \"$name\" executed \"$cmd\"" >> $COMMANDLOG
 
-        for H in $(getHooksFor remoteCommand); do
+        for H in $(getHooksFor remoteCommand $INSTANCE); do
                 $H $INSTANCE "$cmd" "$name"
         done
@@ -83 +83 @@
         echo "$(timestamp): Telnet from \"$ip\" executed \"$cmd\"" >> $COMMANDLOG
 
-        for H in $(getHooksFor telnetCommand); do
+        for H in $(getHooksFor telnetCommand $INSTANCE); do
                 $H $INSTANCE "$cmd" "$ip"
         done