Changeset 248

Timestamp:

Jul 26, 2015, 5:20:54 PM (9 years ago)

Author:

alloc

Message:

Scripts

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• commands/instances.sh (modified) (1 diff)
• commands/status.sh (modified) (1 diff)
• commands/stop.sh (modified) (1 diff)
• commands/updateengine.sh (modified) (5 diffs)
• commands/updatefixes.sh (added)
• commands/updatescripts.sh (modified) (4 diffs)

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

@@ -1 @@
-Version: 93
-Release: 2015-07-06
-DediBuild: 682942
+Version: 94
+Release: 2015-07-26
 

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

@@ -9 +9 @@
                 if [ $(isRunning $I) -eq 1 ]; then
                         run="yes"
-                        cur=$(telnetCommand $I lp | grep -E "^\s?Total of " | cut -d\  -f 3)
+                        cur=$(telnetCommand $I lp | grep -aE "^\s?Total of " | cut -d\  -f 3)
                 else
                         run="no"

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

@@ -20 +20 @@
                 echo "Open ports:"
                 netstat -nlp | grep $(getInstancePID $1) | sed -r 's/^([^ ]*)\s+.*[^ :]*:([^ ]*).*[^ :]*:[^ ]*.*/    \2 (\1)/g' | sort
-                cur=$(telnetCommand $1 lp | grep -E "^\s?Total of " | cut -d\  -f 3)
+                cur=$(telnetCommand $1 lp | grep -aE "^\s?Total of " | cut -d\  -f 3)
                 echo "Players: $cur"
         else

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

@@ -45 +45 @@
                 if [ $(isRunning $1) -eq 1 ]; then
                         echo "Failed, force closing server..."
-                        $SSD --stop --pidfile $(getInstancePath $1)/7dtd.pid
+                        $SSD --stop --signal KILL --pidfile $(getInstancePath $1)/7dtd.pid
                 fi
 

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

@@ -4 +4 @@
 
 sdtdCommandUpdateengine() {
-        local FORCED=no
-        local CHECKONLY=no
-        if [ "$1" = "--force" ]; then
-                FORCED=yes
-        fi
+#       local FORCED=no
+#       if [ "$1" = "--force" ]; then
+#               FORCED=yes
+#       fi
 
         if [ ! -e $SDTD_BASE/steamcmd ]; then
@@ -19 +18 @@
         fi
 
-        if [ "$1" = "--check" -o "$2" = "--check" ]; then
-                local LOCAL=$(getLocalEngineVersion)
-                local REMOTE=$(getRemoteEngineVersion)
-                if [ $REMOTE -gt $LOCAL ]; then
-                        echo "Newer engine version available."
-                else
-                        echo "Engine up to date."
-                fi
-                echo "Local buildid:     $LOCAL"
-                echo "Available buildid: $REMOTE"
-                return
-        fi
+#       if [ "$1" = "--check" -o "$2" = "--check" ]; then
+#               local LOCAL=$(getLocalEngineVersion)
+#               local REMOTE=$(getRemoteEngineVersion)
+#               if [ $REMOTE -gt $LOCAL ]; then
+#                       echo "Newer engine version available."
+#               else
+#                       echo "Engine up to date."
+#               fi
+#               echo "Local buildid:     $LOCAL"
+#               echo "Available buildid: $REMOTE"
+#               return
+#       fi
 
         for I in $(getInstanceList); do
@@ -42 +41 @@
         local LOCAL=$(getLocalEngineVersion)
         #local REMOTE=$(getRemoteEngineVersion)
-        local LOCAL_SUPPORTED_BUILD=$(cat /usr/local/lib/7dtd/VERSION | grep "DediBuild" | cut -d\  -f2)
+        #local LOCAL_SUPPORTED_BUILD=$(cat /usr/local/lib/7dtd/VERSION | grep "DediBuild" | cut -d\  -f2)
 
 #       if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
@@ -51 +50 @@
 
 #               if [ "$LOCAL_SUPPORTED_BUILD" != "$REMOTE" ]; then
-                        echo "WARNING!!! The currently installed version of the scripts might not support the newer dedicated server build!"
-                        echo "If you continue you might not be able to start the server."
+#                       echo "WARNING!!! The currently installed version of the scripts might not support the newer dedicated server build!"
+#                       echo "If you continue you might not be able to start the server."
 #                       echo "Please wait for an updated release of the scripts or continue at your own risk."
-                        echo
+#                       echo
 #               fi
         
@@ -85 +84 @@
                 ./steamcmd.sh +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine +app_update 294420 validate +quit
 
+                if [ -d /usr/local/lib/7dtd/server-fixes ]; then
                 cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R
+                fi
 
                 chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine
 
-                if [ "$LOCAL_SUPPORTED_BUILD" != "$REMOTE" ]; then
-                        echo
-                        echo "Also update the scripts as soon as there is a new release for this dedicated server build."
-                        echo
-                fi
+#               if [ "$LOCAL_SUPPORTED_BUILD" != "$REMOTE" ]; then
+#                       echo
+#                       echo "Also update the scripts as soon as there is a new release for this dedicated server build."
+#                       echo
+#               fi
 #       else
 #               echo "Engine is already at the newest build (local: $LOCAL, remote: $REMOTE)."

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

@@ -8 +8 @@
         
         local LOCAL_BUILD=$(getLocalEngineVersion)
-        local LOCAL_SUPPORTED_BUILD=$(cat /usr/local/lib/7dtd/VERSION | grep "DediBuild" | cut -d\  -f2)
-        local REMOTE_SUPPORTED_BUILD=$(wget -qO- http://illy.bz/fi/7dtd/VERSION | grep "DediBuild" | cut -d\  -f2)
         
         local FORCED
@@ -19 +17 @@
         if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
                 echo "A newer version of the scripts is available."
-                echo "Local:     v.$LOCAL (supported dedi build: $LOCAL_SUPPORTED_BUILD)"
-                echo "Available: v.$REMOTE (supported dedi build: $REMOTE_SUPPORTED_BUILD)"
+                echo "Local:     v.$LOCAL"
+                echo "Available: v.$REMOTE"
                 echo
                 echo "Please check the release notes before continuing:"
                 echo "  https://7dtd.illy.bz/wiki/Release%20Notes"
                 echo
-                
-                if [ "$LOCAL_BUILD" != "$REMOTE_SUPPORTED_BUILD" ]; then
-                        echo "NOTE: The newer scripts are made for a more recent build ($REMOTE_SUPPORTED_BUILD) of the dedicated server than you are running ($LOCAL_BUILD)!"
-                        echo "You will have to update the engine after updating to those new scripts!"
-                        echo
-                fi
                 
                 while : ; do
@@ -62 +54 @@
                 chmod 0755 /usr/local/lib/7dtd -R
                 
-                if [ -e $SDTD_BASE/engine/7DaysToDie_Data/Managed ]; then
-                        cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R
-                        chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine/
+                if [ -d $SDTD_BASE/engine ]; then
+                        if [ -d /usr/local/lib/7dtd/server-fixes ]; then
+                                cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R
+                                chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine/
+                        fi
                 fi
 
@@ -73 +67 @@
                 echo "were new files added to the user folder /home/sdtd those changes"
                 echo "have not been applied!"
-
-                if [ "$LOCAL_BUILD" != "$REMOTE_SUPPORTED_BUILD" ]; then
-                        echo
-                        echo "Please do now update the engine by running '7dtd.sh updateengine'"
-                fi
         else
                 echo "Scripts are already at the newest version (v.$LOCAL)."