From c37f292f6221f1e233ba8e1da01abf1b2822797e Mon Sep 17 00:00:00 2001 From: William Petit Date: Wed, 11 May 2022 09:32:21 +0200 Subject: [PATCH] chore: fix install script --- misc/script/install.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/misc/script/install.sh b/misc/script/install.sh index 2867773..5509c0f 100644 --- a/misc/script/install.sh +++ b/misc/script/install.sh @@ -6,31 +6,31 @@ FORMIDABLE_DESTDIR="." FORMIDABLE_FILE_BASENAME="frmd" function main { - test -z "$FORMIDABLE_VERSION" && FORMIDABLE_VERSION="$(curl -sfL -o /dev/null -w %{url_effective} "$FORMIDABLE_RELEASES_URL/latest" | + test -z "${FORMIDABLE_VERSION}" && FORMIDABLE_VERSION="$(curl -sfL -o /dev/null -w %{url_effective} "${FORMIDABLE_RELEASES_URL}/latest" | rev | cut -f1 -d'/'| rev)" # Check version variable initialization - test -z "$FORMIDABLE_VERSION" && { + test -z "${FORMIDABLE_VERSION}" && { echo "Unable to get Formidable version !" >&2 exit 1 } - test -z "$FORMIDABLE_TMPDIR" && FORMIDABLE_TMPDIR="$(mktemp -d)" - export TAR_FILE="$FORMIDABLE_TMPDIR/${FILE_BASENAME}_$(uname -s)_$(uname -m).tar.gz" + test -z "${FORMIDABLE_TMPDIR}" && FORMIDABLE_TMPDIR="$(mktemp -d)" + export TAR_FILE="${FORMIDABLE_TMPDIR}/${FORMIDABLE_FILE_BASENAME}_${FORMIDABLE_VERSION}_$(uname -s)_$(uname -m).tar.gz" ( - cd "$FORMIDABLE_TMPDIR" + cd "${FORMIDABLE_TMPDIR}" # Download Formidable - echo "Downloading Formidable $FORMIDABLE_VERSION..." - curl -sfLo "$TAR_FILE" \ - "$FORMIDABLE_RELEASES_URL/download/$FORMIDABLE_VERSION/${FORMIDABLE_FILE_BASENAME}_$(uname -s)_$(uname -m).tar.gz" || + echo "Downloading Formidable ${FORMIDABLE_VERSION}..." + curl -sfLo "${TAR_FILE}" \ + "${FORMIDABLE_RELEASES_URL}/download/${FORMIDABLE_VERSION}/${FORMIDABLE_FILE_BASENAME}_${FORMIDABLE_VERSION}_$(uname -s)_$(uname -m).tar.gz" || ( echo "Error while downloading Formidable !" >&2 && exit 1 ) # Download checksums - curl -sfLo "checksums.txt" "$FORMIDABLE_RELEASES_URL/download/$FORMIDABLE_VERSION/checksums.txt" + curl -sfLo "checksums.txt" "${FORMIDABLE_RELEASES_URL}/download/${FORMIDABLE_VERSION}/checksums.txt" echo "Verifying checksums..." sha256sum --ignore-missing --quiet --check checksums.txt || @@ -38,10 +38,12 @@ function main { ) # Extracting archive files - tar -xf "$TAR_FILE" -C "$FORMIDABLE_TMPDIR" + tar -xf "${TAR_FILE}" -C "${FORMIDABLE_TMPDIR}" # Moving downloaded binary to destination directory - mv -f "$FORMIDABLE_TMPDIR/$FORMIDABLE_FILE_BASENAME" "$FORMIDABLE_DESTDIR/" + mv -f "${FORMIDABLE_TMPDIR}/${FORMIDABLE_FILE_BASENAME}" "${FORMIDABLE_DESTDIR}/" + + echo "You can now use '${FORMIDABLE_DESTDIR}/${FORMIDABLE_FILE_BASENAME}', enjoy !" } main $@ \ No newline at end of file