Changeset 478 for scripts/usr/local/lib/7dtd/commands/updateengine.sh

Timestamp:

Nov 13, 2023, 4:07:41 PM (12 months ago)

Author:

alloc

Message:

Scripts updates

File:

• scripts/usr/local/lib/7dtd/commands/updateengine.sh (modified) (5 diffs)

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

@@ -76 +76 @@
         if [ "$CHECKONLY" = "yes" ]; then
                 local LOCAL=$(getLocalEngineVersion)
-                local REMOTE=$(getBuildId $(getLocalBranch))
-                local REMOTETIME=$(getBuildUpdateTime $(getLocalBranch))
+                local REMOTE=$(getRemoteBuildId $(getLocalBranch))
+                local REMOTETIME=$(getRemoteBuildUpdateTime $(getLocalBranch))
                 
                 echo "Installed:"
@@ -91 +91 @@
                 for I in $(getBranchNames); do
                         if [[ $I != test* ]] || [ "$SHOWINTERNAL" = "yes" ]; then
-                                local BUILD=$(getBuildId $I)
-                                local CREATED=$(getBuildUpdateTime $I)
+                                local BUILD=$(getRemoteBuildId $I)
+                                local CREATED=$(getRemoteBuildUpdateTime $I)
                                 printf "%-*s | %*s | %2s\n" 22 "$I" 8 "$BUILD" "$CREATED"
                         fi
@@ -107 +107 @@
                         for I in $(getBranchNames); do
                                 if [[ $I != test* ]] || [ "$SHOWINTERNAL" = "yes" ]; then
-                                        local BUILD=$(getBuildId $I)
-                                        local CREATED=$(getBuildUpdateTime $I)
+                                        local BUILD=$(getRemoteBuildId $I)
+                                        local CREATED=$(getRemoteBuildUpdateTime $I)
                                         if [ $BUILD -gt $MAXREMOTE ]; then
                                                 MAXREMOTE=$BUILD
@@ -134 +134 @@
 
         local LOCAL=$(getLocalEngineVersion)
-        local REMOTE=$(getBuildId $BRANCHNAME)
+        local REMOTE=$(getRemoteBuildId $BRANCHNAME)
 
         if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
                 echo "A newer version of the engine is available."
                 echo "Local build id:     $LOCAL (installed on $(getLocalEngineUpdateTime))"
-                echo "Available build id: $REMOTE (from $(getBuildUpdateTime $BRANCHNAME))"
+                echo "Available build id: $REMOTE (from $(getRemoteBuildUpdateTime $BRANCHNAME))"
                 echo
 
@@ -222 +222 @@
         fi
 }
-
-# Get the latest remote (on Steam) engine version numbers etc
-updateRemoteEngineInfo() {
-        local DOCHECK=no
-        if [ ! -e /tmp/7dtd-appinfo ]; then
-                DOCHECK=yes
-        else
-                AGE=$((`date +%s` - `stat -L --format %Y /tmp/7dtd-appinfo`))
-                if [ $AGE -gt 600 ]; then
-                        DOCHECK=yes
-                fi
-        fi
-        if [ "$DOCHECK" = "yes" ]; then
-                echo "Updating version information..."
-                rm /root/Steam/appcache/appinfo.vdf
-                cd $SDTD_BASE/steamcmd
-
-                ./steamcmd.sh +login anonymous +app_info_request 294420 +app_info_update +app_info_update 1 +app_info_print 294420 +quit | grep -A 1000 \"294420\" 2>/dev/null > /tmp/7dtd-appinfo
-        
-                local BUILDID=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"public\" | grep -B 10 \} --max-count=1 | grep \"buildid\" | cut -d\" -f4)
-
-                if [ $(isANumber "$BUILDID") -eq 0 ]; then
-                        rm -f /tmp/7dtd-appinfo
-                fi
-        fi
-}
-
-# Get the latest build id (on Steam)
-# Params:
-#   1. Branch name
-# Returns:
-#   "?" if data could not be retrieved
-#   BuildId otherwise
-getBuildId() {
-        local BUILDID=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"$1\" | grep -B 10 \} --max-count=1 | grep \"buildid\" | cut -d\" -f4)
-
-        if [ $(isANumber "$BUILDID") -eq 0 ]; then
-                echo "?"
-        else
-                echo $BUILDID
-        fi
-}
-
-# Get the update time of the latest build (on Steam)
-# Params:
-#   1. Branch name
-# Returns:
-#   "?" if data could not be retrieved
-#   Update timestamp otherwise
-getBuildUpdateTime() {
-        local TIMESTAMP=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"$1\" | grep -B 10 \} --max-count=1 | grep \"timeupdated\" | cut -d\" -f4)
-        
-        if [ $(isANumber "$TIMESTAMP") -eq 0 ]; then
-                echo "?"
-        else
-                date --date="@${TIMESTAMP}" "+%Y-%m-%d %H:%M:%S"
-        fi
-}
-
-# Get a list of available branch names, blank separated
-# Returns:
-#   Blank separated list of branch names (can be empty if an error occured)
-getBranchNames() {
-        grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -E '^[[:space:]]*"[^"]+"[[:space:]]*$' | tail --lines=+2 | cut -d\" -f2
-}
-