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

Timestamp:

Jul 19, 2014, 1:53:35 PM (10 years ago)

Author:

alloc

Message:

v.32

Location:

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

Files:

• updateengine.sh (modified) (3 diffs)
• updatescripts.sh (modified) (4 diffs)

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

@@ -42 +42 @@
         local LOCAL=$(getLocalEngineVersion)
         local REMOTE=$(getRemoteEngineVersion)
+        local LOCAL_SUPPORTED_BUILD=$(cat /usr/local/lib/7dtd/VERSION | grep "DediBuild" | cut -d\  -f2)
 
         if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
@@ -48 +49 @@
                 echo "Available buildid: $REMOTE"
                 echo
-                
+
+                if [ "$LOCAL_SUPPORTED_BUILD" != "$REMOTE" ]; then
+                        echo "WARNING!!! The currently installed version of the scripts do 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
+                fi
+        
                 while : ; do
                         local CONTINUE
@@ -70 +78 @@
 
                 cp $SDTD_BASE/linux_files/engine/* $SDTD_BASE/engine/ -R
+                cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/7DaysToDie_Data/Managed/
                 cp $SDTD_BASE/engine/Install/32bit/SteamworksManaged.dll $SDTD_BASE/engine/7DaysToDie_Data/Managed/
 
                 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
         else
                 echo "Engine is already at the newest build (local: $LOCAL, remote: $REMOTE)."

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

@@ -6 +6 @@
         local LOCAL=$(cat /usr/local/lib/7dtd/VERSION | grep "Version" | cut -d\  -f2)
         local REMOTE=$(wget -qO- http://illy.bz/fi/7dtd/VERSION | grep "Version" | cut -d\  -f2)
+        
+        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
@@ -15 +19 @@
         if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
                 echo "A newer version of the scripts is available."
-                echo "Local:     v.$LOCAL"
-                echo "Available: v.$REMOTE"
+                echo "Local:     v.$LOCAL (supported dedi build: $LOCAL_SUPPORTED_BUILD)"
+                echo "Available: v.$REMOTE (supported dedi build: $REMOTE_SUPPORTED_BUILD)"
                 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
@@ -52 +62 @@
                 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/7DaysToDie_Data/Managed/
+                        chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine/7DaysToDie_Data/Managed/
+                fi
+
                 echo "Update done."
                 echo
@@ -58 +73 @@
                 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)."