diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index d92beca..76103f7 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -2,27 +2,27 @@ # Copyright (c) 2022 fithwum # All rights reserved -VS_VERSION_2=$(curl -s "http://api.vintagestory.at/${VS_CHANNEL}.json" | jq --raw-output '.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') +VS_VERSION_2=$(curl -s "http://api.vintagestory.at/$VS_CHANNEL.json" | jq --raw-output '.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 "$VS_VERSION_2" echo "$VS_VERSION_3" CUR_V="$(find /VSserver/server -name server-* | cut -d '-' -f2-)" -if [ ! -z "${VS_VERSION}" ] && [ "${CUR_V}" != "${VS_VERSION}" ]; then - echo "---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 "---Static version: ${VS_VERSION} locally found!---" - LAT_V="${CUR_V}" +if [ ! -z "$VS_VERSION" ] && [ "$CUR_V" != "$VS_VERSION" ]; then + echo "---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 "---Static version: $VS_VERSION locally found!---" + LAT_V="$CUR_V" DL_URL="local" else - JSON="$(wget -qO- http://api.vintagestory.at/${VS_CHANNEL}.json)" - LAT_V="$(echo "${JSON}" | jq -r 'keys_unsorted[]' | head -1)" - DL_URL="$(echo "${JSON}" | jq -r --arg version "${LAT_V}" '.[$version].linuxserver.urls.cdn')" + JSON="$(wget -qO- http://api.vintagestory.at/$VS_CHANNEL.json)" + LAT_V="$(echo "$JSON" | jq -r 'keys_unsorted[]' | head -1)" + DL_URL="$(echo "$JSON" | jq -r --arg version "$LAT_V" '.[$version].linuxserver.urls.cdn')" fi -VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/stable/vs_server_linux-x64_$CUR_V.tar.gz +VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux-x64_$CUR_V.tar.gz # Main install (Debian). # Check for server files and download if needed. @@ -33,15 +33,14 @@ if [ -e /VSserver/server-$CUR_V.sh ] else echo " " echo "WARNING ! server-$CUR_V.sh is out of date/missing ... will download now." - mkdir /VSserver/server echo " " echo "INFO ! Cleaning old files." mkdir /VSserver/old-server-versions/ - mv /VSserver/server/. /VSserver/old-server-versions/server/ + 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_$CUR_V.tar.gz tar -xzf /VStemp/vs_server_linux-x64_$CUR_V.tar.gz -C /VStemp/files rm -fr /VStemp/vs_server_linux-x64_*.*.*.tar.gz - cp -uR /VStemp/files/. /VSserver/server/ + cp -uR /VStemp/files/* /VSserver/server/ rm -fr /VStemp/files/ mv /VSserver/server/server.sh /VSserver/server/server-$CUR_V.sh fi