From 6af3a96bcde4f229865565ee8b9c26b6863bdc1e Mon Sep 17 00:00:00 2001 From: fithwum Date: Wed, 11 Jun 2025 08:44:58 -0700 Subject: [PATCH] test --- vanilla/install_script.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index 4461f97..ac44355 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -2,8 +2,8 @@ # Copyright (c) 2022 fithwum # All rights reserved -VS_VERSION_2="$(curl -s "http://api.vintagestory.at/$VS_CHANNEL.json" | jq --raw-output version "$VS_VERSION" '.[].linuxserver.urls.cdn')" -VS_VERSION_3="$(curl -s "http://api.vintagestory.at/$VS_CHANNEL.json" | jq -r --arg version "$VS_VERSION" '.[].linuxserver.urls.cdn')" +VS_VERSION_2="$(curl -s "http://api.vintagestory.at/$VS_CHANNEL.json" | jq --raw-output version "$VS_VERSION" '.[$version].linuxserver.urls.cdn')" +VS_VERSION_3="$(curl -s "http://api.vintagestory.at/$VS_CHANNEL.json" | jq -r --arg version "$VS_VERSION" '.[$version].linuxserver.urls.cdn')" echo " " echo "INFO ! $VS_VERSION_2" sleep 10 @@ -12,14 +12,13 @@ echo "INFO ! $VS_VERSION_3" sleep 10 CUR_V="$(find /VSserver/server -name server-*.sh | cut -d '-' -f2-)" - echo " " if [ ! -z "$VS_VERSION" ] && [ "$CUR_V" != "$VS_VERSION" ]; then echo "INFO ! Static version: $VS_VERSION set!" DL_URL="$(wget -qO- http://api.vintagestory.at/$VS_CHANNEL.json | jq -r --arg version "$VS_VERSION" '.[$version].linuxserver.urls.cdn')" LAT_V="$VS_VERSION" elif [ ! -z "$VS_VERSION" ] && [ ! -z "$CUR_V" ] && [ "$CUR_V" == "$VS_VERSION" ]; then - echo "INFO ! Static version: $VS_VERSION locally found!" + echo "INFO ! Static version: $VS_VERSION found locally!" LAT_V="$CUR_V" DL_URL="local" else @@ -37,11 +36,11 @@ sleep 20 # sleep infinity # fi # echo " " -# echo "INFO ! Can't get lateste version but found local version, continuing with local version..." +# echo "INFO ! Can't get latest version but found local version, continuing with local version..." # LAT_V="$CUR_V" # fi -VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux-x64_$CUR_V.tar.gz +VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux-x64_$LAT_V.tar.gz # Main install (Debian). # Check for server files and download if needed. @@ -56,7 +55,10 @@ if [ -e /VSserver/server/server-$LAT_V.sh ] echo "INFO ! Cleaning old files." mkdir /VSserver/old-server-versions/ mv /VSserver/server/* /VSserver/old-server-versions/server/ - wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /VStemp/vs_server_linux-x64_$LAT_V.tar.gz + if wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /VStemp/vs_server_linux-x64_$LAT_V.tar.gz + then + echo "INFO ! server version $LAT_V download complete." + fi tar -xzf /VStemp/vs_server_linux-x64_$LAT_V.tar.gz -C /VStemp/files rm -fr /VStemp/vs_server_linux-x64_*.*.*.tar.gz cp -uR /VStemp/files/* /VSserver/server/