diff --git a/alpine/files/Install_Script.sh b/alpine/files/Install_Script.sh index 0853688..d6872ba 100644 --- a/alpine/files/Install_Script.sh +++ b/alpine/files/Install_Script.sh @@ -4,29 +4,33 @@ # Variables. # echo " " -# echo "Checking for new server version from Teamspeak." +# echo "Checking server version from Teamspeak." # TS_VERSION=$(curl -s "https://www.teamspeak.com/versions/server.json" | jq --raw-output '.linux.x86.version') -CHANGELOG=/ts3server/CHANGELOG_$TS_VERSION -# echo "Latest server version from Teamspeak:$TS_VERSION" +# CHANGELOG=/ts3server/CHANGELOG_$TS_VERSION +# echo "Latest server version from Teamspeak:$TS_VERSION." + +: "${AUTO_UPDATE:=true}" +AUTO_UPDATE="${AUTO_UPDATE,,}" +AUTO_UPDATE="${AUTO_UPDATE//[$'\r ']/}" + +echo "DEBUG: Variable hex output is: $(echo -n "$AUTO_UPDATE" | xxd -p)" + +if [ "$AUTO_UPDATE" = "true" ]; then + echo "INFO ! Teamspeak will auto update to the latest version." + echo "Checking server version from Teamspeak." + TS_VERSION=$(curl -s "https://www.teamspeak.com/versions/server.json" | jq --raw-output '.linux.x86.version') + CHANGELOG=/ts3server/CHANGELOG_$TS_VERSION + echo "Latest server version from Teamspeak:$TS_VERSION." +elif [ "$AUTO_UPDATE" = "false" ]; then + echo "INFO ! The version you selected will be installed." +else + echo "ERROR ! AUTO_UPDATE must be set to true or false on first run" + sleep infinity +fi TS_FILES=https://gitea.fithwum.tech/fithwum/teamspeak-server/raw/branch/main/files TS_SERVER=https://files.teamspeak-services.com/releases/server/$TS_VERSION/teamspeak3-server_linux_amd64-$TS_VERSION.tar.bz2 -if [ "$ACCEPT_EULA" = "true" ]; then - echo "INFO ! Accepting EULA (one-time)" - sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \ - || echo "eula=true" > "$EULA_FILE" - touch "$EULA_MARKER" -elif [ "$ACCEPT_EULA" = "false" ]; then - echo "WARNING ! EULA not accepted on first run" - echo "WARNING ! Set ACCEPT_EULA=true to proceed" - sleep infinity -fi -else - echo "ERROR ! ACCEPT_EULA must be set to true or false on first run" - sleep infinity -fi - # Main install (alpine). # Check for files in /ts3server and download/create if needed. if [ -e "$CHANGELOG" ] diff --git a/debian/files/Install_Script.sh b/debian/files/Install_Script.sh index 0e34293..7ec330f 100644 --- a/debian/files/Install_Script.sh +++ b/debian/files/Install_Script.sh @@ -10,7 +10,8 @@ # echo "Latest server version from Teamspeak:$TS_VERSION." : "${AUTO_UPDATE:=true}" -AUTO_UPDATE=$(echo "$AUTO_UPDATE" | tr '[:upper:]' '[:lower:]') +AUTO_UPDATE="${AUTO_UPDATE,,}" +AUTO_UPDATE="${AUTO_UPDATE//[$'\r ']/}" echo "DEBUG: Variable hex output is: $(echo -n "$AUTO_UPDATE" | xxd -p)" @@ -21,10 +22,10 @@ if [ "$AUTO_UPDATE" = "true" ]; then CHANGELOG=/ts3server/CHANGELOG_$TS_VERSION echo "Latest server version from Teamspeak:$TS_VERSION." elif [ "$AUTO_UPDATE" = "false" ]; then - echo "INFO ! The version you selected will be installed." + echo "INFO ! The version you selected will be installed." else - echo "ERROR ! AUTO_UPDATE must be set to true or false on first run" - sleep infinity + echo "ERROR ! AUTO_UPDATE must be set to true or false on first run" + sleep infinity fi TS_FILES=https://gitea.fithwum.tech/fithwum/teamspeak-server/raw/branch/main/files