Changeset 479

Timestamp:

Nov 13, 2023, 4:38:42 PM (13 months ago)

Author:

alloc

Message:

Scripts

Location:

scripts/usr/local/lib/7dtd

Files:

• commands/updateengine.sh (modified) (2 diffs)
• common.sh (modified) (4 diffs)
• steamcmd.exp (modified) (1 diff)

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

@@ -98 +98 @@
                 
                 echo
+                
+                if [ "$REMOTE" = "?" ]; then
+                        echo "Could not fetch remote build information"
+                        return
+                fi
                 
                 if [ $REMOTE -gt $LOCAL ]; then
@@ -135 +140 @@
         local LOCAL=$(getLocalEngineVersion)
         local REMOTE=$(getRemoteBuildId $BRANCHNAME)
+        
+        if [ "$REMOTE" = "?" ]; then
+                echo "Could not fetch remote build information, assuming update to be available"
+                REMOTE=30123456
+        fi
 
         if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then

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

@@ -185 +185 @@
         if [ "$DOCHECK" = "yes" ]; then
                 echo "Updating version information..."
-                rm /root/Steam/appcache/appinfo.vdf
+                rm -f /root/Steam/appcache/appinfo.vdf
                 cd $SDTD_BASE/steamcmd
                 
                 expect /usr/local/lib/7dtd/steamcmd.exp $SDTD_BASE/steamcmd/steamcmd.sh 294420 2>/dev/null > /tmp/7dtd-appinfo
 
-                local BUILDID=$(getBuildId public)
+                local BUILDID=$(getRemoteBuildId public)
 
                 if [ $(isANumber "$BUILDID") -eq 0 ]; then
@@ -205 +205 @@
 #   BuildId otherwise
 getRemoteBuildId() {
+        if [ ! -f "/tmp/7dtd-appinfo" ]; then
+                echo "?"
+                return
+        fi
+        
         local BUILDID=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"$1\" | grep -B 10 \} --max-count=1 | grep \"buildid\" | cut -d\" -f4)
 
@@ -221 +226 @@
 #   Update timestamp otherwise
 getRemoteBuildUpdateTime() {
+        if [ ! -f "/tmp/7dtd-appinfo" ]; then
+                echo "?"
+                return
+        fi
+        
         local TIMESTAMP=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"$1\" | grep -B 10 \} --max-count=1 | grep \"timeupdated\" | cut -d\" -f4)
         
@@ -234 +244 @@
 #   Blank separated list of branch names (can be empty if an error occured)
 getBranchNames() {
+        if [ ! -f "/tmp/7dtd-appinfo" ]; then
+                return
+        fi
+        
         grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -E '^[[:space:]]*"[^"]+"[[:space:]]*$' | tail --lines=+2 | cut -d\" -f2
 }

scripts/usr/local/lib/7dtd/steamcmd.exp

@@ -4 +4 @@
 }
 
-set timeout 5
+set timeout 30
 
 set STEAMCMD [lindex $argv 0]