From a6eb01856671b7582e38fdac1e732b07ddd96a79 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 4 Feb 2025 22:08:45 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/root/docker/setup/05-custom.sh --- rootfs/root/docker/setup/05-custom.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rootfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh index c22ea9c..f78d13a 100755 --- a/rootfs/root/docker/setup/05-custom.sh +++ b/rootfs/root/docker/setup/05-custom.sh @@ -19,20 +19,21 @@ # shellcheck disable=SC2317 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail -x +set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 ARIANG_TEMP_FILE="/tmp/AriaNg.zip" +ARIANG_HOME="/usr/local/share/ariang" ARIANG_VERSION="${ARIANG_VERSION:-1.3.9}" -ARIANG_LASTEST="$(curl -q -LSsf "https://api.github.com/repos/mayswind/AriaNg/releases" | jq -rc '.[].tag_name' | sort -rV | head -n1 | grep '^')" +ARIANG_LASTEST="$(curl -q -LSsf "https://api.github.com/repos/mayswind/AriaNg/releases" | jq -rc '.[].tag_name' | sort -rV | head -n1 | grep '^' || false)" ARIANG_ARCHIVE_FILE="https://github.com/mayswind/AriaNg/releases/download/${ARIANG_LASTEST:-$ARIANG_VERSION}/AriaNg-${ARIANG_LASTEST:-$ARIANG_VERSION}.zip" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions -[ -d "/usr/local/share/ariang" ] || mkdir -p "/usr/local/share/ariang" +[ -d "$ARIANG_HOME" ] || mkdir -p "$ARIANG_HOME" if curl -q -LSsf "$ARIANG_ARCHIVE_FILE" -o "$ARIANG_TEMP_FILE"; then - unzip -qq "$ARIANG_TEMP_FILE" -d "/usr/local/share/ariang" + unzip -qq "$ARIANG_TEMP_FILE" -d "$ARIANG_HOME" exitCode=$? else exitCode=9