Changeset 257

Timestamp:

Feb 16, 2016, 8:34:20 PM (9 years ago)

Author:

alloc

Message:

Scripts: Removed Steam login

Files:

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

bootstrapper/bootstrap.sh

@@ -183 +183 @@
 }
 
-setSteamLoginData() {
-        echo -e "Steam account data\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
-}
-
 installSteamCmdAndSDTD() {
         echo -e "Installing SteamCMD and 7DtD\n"
@@ -269 +242 @@
         setupUser
         installManagementScripts
-        setSteamLoginData
         installSteamCmdAndSDTD
         if [ $ADDCRONJOBS -eq 1 ]; then

scripts/etc/7dtd.conf

@@ -1 +1 @@
 #!/bin/sh
-
-# User login info for Steam to download/update the engine
-export STEAM_USER=
-export STEAM_PASS=
 
 # Root of the 7dtd folders, containing e.g. the "engine", "instances" folders

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

@@ -1 @@
-Version: 94
-Release: 2015-07-26
+Version: 95
+Release: 2016-02-16
 

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

@@ -73 +73 @@
                 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
-                ./steamcmd.sh +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine +app_update 294420 validate +quit
+                ./steamcmd.sh +login anonymous +force_install_dir $SDTD_BASE/engine +app_update 294420 validate +quit
 
                 if [ -d /usr/local/lib/7dtd/server-fixes ]; then
-                cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R
+                        cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R
                 fi