diff --git a/scripts/file_unpacker.sh b/scripts/file_unpacker.sh index c5d818f5..0389f2e6 100644 --- a/scripts/file_unpacker.sh +++ b/scripts/file_unpacker.sh @@ -3,11 +3,16 @@ ## The value for ${DOWNLOAD_LINK##*/} is derived from DOWNLOAD_LINK ## if the download link is https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar then the ##*/ is server.jar +apt update +apt install -y curl file unzip + +curl -sSL ${DOWNLOAD_LINK} + FILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*/} | cut -d',' -f2 | cut -d' ' -f2) if [ "$FILETYPE" == "gzip" ]; then tar xzvf ${DOWNLOAD_LINK##*/} elif [ "$FILETYPE" == "Zip" ]; then - unzip ${DOWNLOAD_LINK##*/} + unzip -o ${DOWNLOAD_LINK##*/} elif [ "$FILETYPE" == "XZ" ]; then tar xvf ${DOWNLOAD_LINK##*/} else diff --git a/scripts/github_release_grabber.sh b/scripts/github_release_grabber.sh index 14d4e70e..ccbeba09 100644 --- a/scripts/github_release_grabber.sh +++ b/scripts/github_release_grabber.sh @@ -2,6 +2,8 @@ ## this requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (match is to match the filename in some way) ## this supports using oauth/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.) ## if you are getting hit with GitHub API limit issues then you need to have the user and token set. +apt update +apt install -y curl jq if [ -z "${GITHUB_USER}" ] && [ -z "${GITHUB_OAUTH_TOKEN}" ] ; then echo -e "using anon api call" @@ -15,13 +17,13 @@ LATEST_JSON=$(curl --silent "https://api.github.com/repos/${GITHUB_PACKAGE}/rele RELEASES=$(curl --silent "https://api.github.com/repos/${GITHUB_PACKAGE}/releases") if [ -z "${VERSION}" ] || [ "${VERSION}" == "latest" ]; then - DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH}) + DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH}) else VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION "${VERSION}" '.[] | select(.tag_name==$VERSION) | .tag_name') if [ "${VERSION}" == "${VERSION_CHECK}" ]; then - DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION "${VERSION}" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH}) + DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION "${VERSION}" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH}) else echo -e "defaulting to latest release" - DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url) + DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url) fi fi \ No newline at end of file