Changeset 53 for scripts

Timestamp:

Jun 9, 2014, 2:00:26 PM (10 years ago)

Author:

alloc

Message:

Version 15: Fixes #16, adds --force to updatescripts

Location:

scripts

Files:

• etc/cron.d/7dtd-backup (modified) (1 diff)
• usr/local/lib/7dtd/VERSION (modified) (1 diff)
• usr/local/lib/7dtd/commands/backup.sh (modified) (4 diffs)
• usr/local/lib/7dtd/commands/updateengine.sh (modified) (3 diffs)
• usr/local/lib/7dtd/commands/updatescripts.sh (modified) (3 diffs)
• usr/local/lib/7dtd/common.sh (modified) (1 diff)

scripts/etc/cron.d/7dtd-backup

@@ -1 @@
-#0 *     * * *   root    /usr/local/bin/7dtd.sh backup
+#0 *     * * *   root    nice -n 15 /usr/local/bin/7dtd.sh backup

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

@@ -1 @@
-Version: 14
+Version: 15
 Release: 2014-06-09

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

@@ -13 +13 @@
                 local fileI
                 for fileI in "$SDTD_BACKUP_ROOT"/*; do
-                        if [ $fileI -nt $LatestBackup -a -d $fileI ]; then
+                        if [ "$fileI" -nt "$LatestBackup" -a -d "$fileI" ]; then
                                 LatestBackup=$fileI
                         fi
@@ -64 +64 @@
                         (( num++ ))
                         if [ $num -gt $removeBut ]; then
-                                rm $F
+                                rm -Rf $F
                         fi
                 done
@@ -82 +82 @@
                 local maxKBytes=$(( $SDTD_BACKUP_MAX_STORAGE*1024 ))
                 local curNumFiles=$(ls -t1 $SDTD_BACKUP_ROOT | wc -l)
-                while [ $(du -sk $SDTD_BACKUP_ROOT) -gt $maxKBytes -a $curNumFiles -gt $keepMin ]; do
+                while [ $(du -sk $SDTD_BACKUP_ROOT | tr '[:blank:]' ' ' | cut -d\  -f1) -gt $maxKBytes -a $curNumFiles -gt $keepMin ]; do
                         local toDel=$(ls -tr1 | head -n 1)
                         rm -Rf $toDel
@@ -90 +90 @@
 
         for H in $(getHooksFor backup); do
-                $H $NewBackup
+                if [ "$SDTD_BACKUP_COMPRESS" = "all" ]; then
+                        $H $NewBackup.tar.gz
+                else
+                        $H $NewBackup
+                fi
         done
 }

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

@@ -4 +4 @@
 
 sdtdCommandUpdateengine() {
-        for I in $(getInstanceList); do
-                if [ $(isRunning $I) -eq 1 ]; then
-                        echo "At least one instance is still running (\"$I\")."
-                        echo "Before updating the engine please stop all instances!"
-                        return
-                fi
-        done
+        local FORCED=no
+        local CHECKONLY=no
+        if [ "$1" = "--force" ]; then
+                FORCED=yes
+        fi
 
         if [ ! -e $SDTD_BASE/steamcmd ]; then
@@ -21 +19 @@
         fi
 
-        cd $SDTD_BASE/steamcmd
+        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
 
-        ./steamcmd.sh +@sSteamCmdForcePlatformType windows +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine "+app_update 251570" validate +quit
+        for I in $(getInstanceList); do
+                if [ $(isRunning $I) -eq 1 ]; then
+                        echo "At least one instance is still running (\"$I\")."
+                        echo "Before updating the engine please stop all instances!"
+                        return
+                fi
+        done
 
-        cp $SDTD_BASE/linux_files/engine/* $SDTD_BASE/engine/ -R
-        cp $SDTD_BASE/engine/Install/32bit/SteamworksManaged.dll $SDTD_BASE/engine/7DaysToDie_Data/Managed/
+        local LOCAL=$(getLocalEngineVersion)
+        local REMOTE=$(getRemoteEngineVersion)
 
-        chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine
+        if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
+                echo "A newer version of the engine is available."
+                echo "Local buildid:     $LOCAL"
+                echo "Available buildid: $REMOTE"
+                echo
+                
+                while : ; do
+                        local CONTINUE
+                        read -p "Continue? (yn) " CONTINUE
+                        case $CONTINUE in
+                                y)
+                                        echo "Updating..."
+                                        break
+                                        ;;
+                                n)
+                                        echo "Canceled"
+                                        return
+                                        ;;
+                                *)
+                                        echo "Wrong input"
+                        esac
+                done
+
+                cd $SDTD_BASE/steamcmd
+                ./steamcmd.sh +@sSteamCmdForcePlatformType windows +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine "+app_update 251570" validate +quit
+
+                cp $SDTD_BASE/linux_files/engine/* $SDTD_BASE/engine/ -R
+                cp $SDTD_BASE/engine/Install/32bit/SteamworksManaged.dll $SDTD_BASE/engine/7DaysToDie_Data/Managed/
+
+                chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine
+        else
+                echo "Engine is already at the newest build (local: $LOCAL, remote: $REMOTE)."
+        fi
 }
 
 sdtdCommandUpdateengineHelp() {
-        echo "Usage: $(basename $0) updateengine"
+        echo "Usage: $(basename $0) updateengine [--force | --check]"
         echo
-        echo "Update the engine (aka game) files of 7dtd."
+        echo "Check for a newer version of engine (aka game) files of 7dtd. If there is a newer"
+        echo "version they can be updated by this command."
+        echo
+        echo "If --force is specified you are asked if you want to redownload the engine"
+        echo "even if there is no new version available."
+        echo
+        echo "If --check is specified it will only output the current local and remote build ids"
+        echo "and if an update is available."
 }
 
@@ -40 +94 @@
         echo "Update the 7dtd engine files"
 }
+
+sdtdCommandUpdateengineExpects() {
+        case $1 in
+                2)
+                        echo "--force --check"
+                        ;;
+        esac
+}
+

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

@@ -4 +4 @@
 
 sdtdCommandUpdatescripts() {
-        LOCAL=$(cat /usr/local/lib/7dtd/VERSION | grep "Version" | cut -d\  -f2)
-        REMOTE=$(wget -qO- http://illy.bz/fi/7dtd/VERSION | grep "Version" | cut -d\  -f2)
+        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)
         
-        if [ $REMOTE -gt $LOCAL ]; then
+        local FORCED
+        if [ "$1" = "--force" ]; then
+                FORCED=yes
+        else
+                FORCED=no
+        fi
+        if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
                 echo "A newer version of the scripts is available."
                 echo "Local:     v.$LOCAL"
@@ -58 +64 @@
 
 sdtdCommandUpdatescriptsHelp() {
-        echo "Usage: $(basename $0) updatescripts"
+        echo "Usage: $(basename $0) updatescripts [--force]"
         echo
         echo "Check for a newer version of the management scripts. If there is a newer"
         echo "version they can be updated by this command."
+        echo
+        echo "If --force is specified you are asked if you want to redownload the scripts"
+        echo "even if there is no new version available."
 }
 
@@ -68 +77 @@
 }
 
+sdtdCommandUpdatescriptsExpects() {
+        case $1 in
+                2)
+                        echo "--force"
+                        ;;
+        esac
+}
+

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

@@ -94 +94 @@
                 echo 0
         fi
+}
+
+# Get the local engine version number (i.e. build id)
+# Returns:
+#   0 if no engine installed or no appmanifest found or buildid could not be read
+#   Build Id otherwise
+getLocalEngineVersion() {
+        local APPMANIFEST=$(find $SDTD_BASE/engine -type f -name "appmanifest_251570.acf")
+        local LOCAL=0
+        if [ -f "$APPMANIFEST" ]; then
+                LOCAL=$(grep buildid "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+                if [ $(isANumber "$LOCAL") -eq 0 ]; then
+                        LOCAL=0
+                fi
+        fi
+        echo $LOCAL
+}
+
+# Get the latest remote engine version number (i.e. build id)
+# Returns:
+#   1 if build id could not be retrieved
+#   Build Id otherwise
+getRemoteEngineVersion() {
+        cd $SDTD_BASE/steamcmd
+        local REMOTE=$(./steamcmd.sh "+app_info_print 251570" +quit | grep -EA 1000 "^\s+\"branches\"$" | grep -EA 5 "^\s+\"public\"$" | grep -m 1 -EB 10 "^\s+}$" | grep -E "^\s+\"buildid\"\s+" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+        if [ $(isANumber "$REMOTE") -eq 0 ]; then
+                REMOTE=1
+        fi
+        echo $REMOTE
 }