diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index 0cdf4da..20013de 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -2,25 +2,25 @@ # 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" '.linuxserver.urls.cdn') -echo "$VS_VERSION_2" -echo "$VS_VERSION_3" +VS_VERSION_2=$(curl -s "http://api.vintagestory.at/$VS_CHANNEL.json" | jq --raw-output '.[$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 "INFO ! $VS_VERSION_2" +echo "INFO ! $VS_VERSION_3" CUR_V="$(find /VSserver/server -name server-*.sh | 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" '.linuxserver.urls.cdn')" + 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 "---Static version: $VS_VERSION locally found!---" + echo "INFO ! 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" '.linuxserver.urls.cdn')" + LAT_V="$(echo "INFO ! $JSON" | jq -r 'keys_unsorted[]' | head -1)" + DL_URL="$(echo "INFO ! $JSON" | jq -r --arg version "$LAT_V" '.[$version].linuxserver.urls.cdn')" fi # if [ -z "$DL_URL" ]; then @@ -60,7 +60,7 @@ fi sleep 1 echo "INFO ! Setting server/data path/username." -sed -e '/VSPATH='*'\c/VSPATH='/VSserver/server'' -e '/DATAPATH='*'\c/DATAPATH='/VSserver/data'' -e '/USERNAME='*'\c/USERNAME='$USERNAME'' /VSserver/server/server-$VS_VERSION.sh +sed -e '/VSPATH='*'/c\VSPATH='/VSserver/server'' -e '/DATAPATH='*'/c\DATAPATH='/VSserver/data'' -e '/USERNAME='*'/c\USERNAME='$USERNAME'' /VSserver/server/server-$VS_VERSION.sh # echo "INFO ! Setting data path." # sed -i '/DATAPATH='*'/c\DATAPATH='/VSserver/data'' /VSserver/server/server-$VS_VERSION.sh # echo "INFO ! Setting username."