Changeset 229

Timestamp:

Apr 11, 2015, 4:45:17 PM (10 years ago)

Author:

alloc

Message:

Scripts 79: Do not require to store Steam account data

Files:

• bootstrapper/bootstrap.sh (modified) (2 diffs)
• scripts/usr/local/lib/7dtd/VERSION (modified) (1 diff)
• scripts/usr/local/lib/7dtd/commands/updateengine.sh (modified) (4 diffs)

bootstrapper/bootstrap.sh

@@ -1 +1 @@
 #!/bin/bash
-VERSION=5
+VERSION=6
 
 if [ `id -u` -ne 0 ]; then
@@ -185 +185 @@
 setSteamLoginData() {
         echo -e "Steam account data\n"
-        echo "Please enter your Steam login data for SteamCMD to get the 7dtd-server files:"
-        read -p "Steam username: " username
-        read -s -p "Steam password: " password
-        sed -i "s/export STEAM_USER=/export STEAM_USER=$username/" /etc/7dtd.conf
-        sed -i "s/export STEAM_PASS=/export STEAM_PASS=$password/" /etc/7dtd.conf
-        echo -e "\n=============================================================\n\n"
+        echo -e "Steam account login data is required for SteamCMD to get the 7dtd-server files.\n"
+        echo -e "Store account login data in /etc/7dtd.conf which will be only readable by root?"
+        echo -e "If you select to NOT store the data you will have to enter it each time you want"
+        echo -e "to update the server files.\n"
+        while : ; do
+                local STOREDATA
+                read -p "Store data in /etc/7dtd.conf? (yn) " STOREDATA
+                case $STOREDATA in
+                        y)
+                                read -p "Steam username: " username
+                                read -s -p "Steam password: " password
+                                sed -i "s/export STEAM_USER=/export STEAM_USER=$username/" /etc/7dtd.conf
+                                sed -i "s/export STEAM_PASS=/export STEAM_PASS=$password/" /etc/7dtd.conf
+                                echo -e "\n=============================================================\n\n"
+                                break
+                                ;;
+                        n)
+                                break
+                                ;;
+                        *)
+                                echo "Wrong input"
+                esac
+        done
 }
 

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

@@ -1 @@
-Version: 78
-Release: 2015-04-09
+Version: 79
+Release: 2015-04-11
 DediBuild: 583520
 

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

@@ -41 +41 @@
 
         local LOCAL=$(getLocalEngineVersion)
-        local REMOTE=$(getRemoteEngineVersion)
+        #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
-                echo "A newer version of the engine is available."
+#       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 "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!"
+#               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 "Please wait for an updated release of the scripts or continue at your own risk."
+#                       echo "Please wait for an updated release of the scripts or continue at your own risk."
                         echo
-                fi
+#               fi
         
                 while : ; do
@@ -73 +73 @@
                         esac
                 done
+                
+                if [ $STEAM_USER = "" ]; then
+                        read -p "Steam username: " STEAM_USER
+                fi
+
+                if [ $STEAM_PASS = "" ]; then
+                        read -s -p "Steam password: " STEAM_PASS
+                fi
 
                 cd $SDTD_BASE/steamcmd
@@ -87 +95 @@
                         echo
                 fi
-        else
-                echo "Engine is already at the newest build (local: $LOCAL, remote: $REMOTE)."
-        fi
+#       else
+#               echo "Engine is already at the newest build (local: $LOCAL, remote: $REMOTE)."
+#       fi
 }
 
 sdtdCommandUpdateengineHelp() {
-        echo "Usage: $(basename $0) updateengine [--force | --check]"
+        echo "Usage: $(basename $0) updateengine" # [--force | --check]"
         echo
         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."
+        echo "version they will 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."
 }
 
@@ -110 +118 @@
 
 sdtdCommandUpdateengineExpects() {
-        case $1 in
-                2)
-                        echo "--force --check"
-                        ;;
-        esac
+#       case $1 in
+#               2)
+#                       echo "--force --check"
+#                       ;;
+#       esac
 }