From 9051db1e8fa0a909aa133d080a06c69a53b49ab8 Mon Sep 17 00:00:00 2001 From: jdx <216188+jdx@users.noreply.github.com> Date: Mon, 23 Dec 2024 14:11:08 -0600 Subject: [PATCH] fix: do not require "v" prefix in mise.run (#3800) --- packaging/standalone/install.envsubst | 5 +++-- scripts/render-install.sh | 28 +++++++++++++-------------- scripts/test-standalone.sh | 6 +++--- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/packaging/standalone/install.envsubst b/packaging/standalone/install.envsubst index 9b3d443f15..c43e1541e0 100644 --- a/packaging/standalone/install.envsubst +++ b/packaging/standalone/install.envsubst @@ -101,7 +101,7 @@ get_checksum() { os="$(get_os)" arch="$(get_arch)" ext="$(get_ext)" - url="https://github.com/jdx/mise/releases/download/${version}/SHASUMS256.txt" + url="https://github.com/jdx/mise/releases/download/v${version}/SHASUMS256.txt" # For current version use static checksum otherwise # use checksum from releases @@ -230,12 +230,13 @@ download_file() { install_mise() { version="${MISE_VERSION:-$MISE_CURRENT_VERSION}" + version="${version#v}" os="$(get_os)" arch="$(get_arch)" ext="$(get_ext)" install_path="${MISE_INSTALL_PATH:-$HOME/.local/bin/mise}" install_dir="$(dirname "$install_path")" - tarball_url="https://github.com/jdx/mise/releases/download/${version}/mise-${version}-${os}-${arch}.${ext}" + tarball_url="https://github.com/jdx/mise/releases/download/v${version}/mise-v${version}-${os}-${arch}.${ext}" cache_file=$(download_file "$tarball_url") debug "mise-setup: tarball=$cache_file" diff --git a/scripts/render-install.sh b/scripts/render-install.sh index ea85704a4a..6aef007b28 100755 --- a/scripts/render-install.sh +++ b/scripts/render-install.sh @@ -3,20 +3,20 @@ set -euxo pipefail # shellcheck disable=SC2016 MISE_CURRENT_VERSION=$MISE_VERSION \ - MISE_CHECKSUM_LINUX_X86_64=$(grep "mise-v.*linux-x64.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_X86_64_MUSL=$(grep "mise-v.*linux-x64-musl.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_ARM64=$(grep "mise-v.*linux-arm64.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_ARM64_MUSL=$(grep "mise-v.*linux-arm64-musl.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_X86_64=$(grep "mise-v.*linux-x64.tar.gz" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_X86_64_MUSL=$(grep "mise-v.*linux-x64-musl.tar.gz" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_ARM64=$(grep "mise-v.*linux-arm64.tar.gz" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_ARM64_MUSL=$(grep "mise-v.*linux-arm64-musl.tar.gz" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ MISE_CHECKSUM_LINUX_ARMV7=$(grep "mise-v.*linux-armv7.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_ARMV7_MUSL=$(grep "mise-v.*linux-armv7-musl.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_MACOS_X86_64=$(grep "mise-v.*macos-x64.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_MACOS_ARM64=$(grep "mise-v.*macos-arm64.tar.gz" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_X86_64_ZSTD=$(grep "mise-v.*linux-x64.tar.zst" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_X86_64_MUSL_ZSTD=$(grep "mise-v.*linux-x64-musl.tar.zst" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_ARM64_ZSTD=$(grep "mise-v.*linux-arm64.tar.zst" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_ARM64_MUSL_ZSTD=$(grep "mise-v.*linux-arm64-musl.tar.zst" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_ARMV7_ZSTD=$(grep "mise-v.*linux-armv7.tar.zst" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_LINUX_ARMV7_MUSL_ZSTD=$(grep "mise-v.*linux-armv7-musl.tar.zst" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ - MISE_CHECKSUM_MACOS_ARM64_ZSTD=$(grep "mise-v.*macos-arm64.tar.zst" "$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_ARMV7_MUSL=$(grep "mise-v.*linux-armv7-musl.tar.gz" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_MACOS_X86_64=$(grep "mise-v.*macos-x64.tar.gz" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_MACOS_ARM64=$(grep "mise-v.*macos-arm64.tar.gz" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_X86_64_ZSTD=$(grep "mise-v.*linux-x64.tar.zst" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_X86_64_MUSL_ZSTD=$(grep "mise-v.*linux-x64-musl.tar.zst" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_ARM64_ZSTD=$(grep "mise-v.*linux-arm64.tar.zst" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_ARM64_MUSL_ZSTD=$(grep "mise-v.*linux-arm64-musl.tar.zst" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_ARMV7_ZSTD=$(grep "mise-v.*linux-armv7.tar.zst" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_LINUX_ARMV7_MUSL_ZSTD=$(grep "mise-v.*linux-armv7-musl.tar.zst" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ + MISE_CHECKSUM_MACOS_ARM64_ZSTD=$(grep "mise-v.*macos-arm64.tar.zst" "$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt") \ envsubst '$MISE_CURRENT_VERSION,$MISE_CHECKSUM_LINUX_X86_64,$MISE_CHECKSUM_LINUX_X86_64_MUSL,$MISE_CHECKSUM_LINUX_ARM64,$MISE_CHECKSUM_LINUX_ARM64_MUSL,$MISE_CHECKSUM_LINUX_ARMV6,$MISE_CHECKSUM_LINUX_ARMV6_MUSL,$MISE_CHECKSUM_LINUX_ARMV7,$MISE_CHECKSUM_LINUX_ARMV7_MUSL,$MISE_CHECKSUM_MACOS_X86_64,$MISE_CHECKSUM_MACOS_ARM64,$MISE_CHECKSUM_LINUX_X86_64_ZSTD,$MISE_CHECKSUM_LINUX_X86_64_MUSL_ZSTD,$MISE_CHECKSUM_LINUX_ARM64_ZSTD,$MISE_CHECKSUM_LINUX_ARM64_MUSL_ZSTD,$MISE_CHECKSUM_LINUX_ARMV7_ZSTD,$MISE_CHECKSUM_LINUX_ARMV7_MUSL_ZSTD,$MISE_CHECKSUM_MACOS_ARM64_ZSTD' \ <"$BASE_DIR/packaging/standalone/install.envsubst" diff --git a/scripts/test-standalone.sh b/scripts/test-standalone.sh index 6d3b58e4d2..c642a7e741 100755 --- a/scripts/test-standalone.sh +++ b/scripts/test-standalone.sh @@ -3,11 +3,11 @@ set -euxo pipefail BASE_DIR="$(pwd)" RELEASE_DIR="$(pwd)/tmp" -MISE_VERSION="v$(curl -fsSL https://mise.jdx.dev/VERSION)" +MISE_VERSION="$(curl -fsSL https://mise.jdx.dev/VERSION)" export BASE_DIR RELEASE_DIR MISE_VERSION -mkdir -p "$RELEASE_DIR/$MISE_VERSION" -curl -fsSL "https://mise.jdx.dev/$MISE_VERSION/SHASUMS256.txt" >"$RELEASE_DIR/$MISE_VERSION/SHASUMS256.txt" +mkdir -p "$RELEASE_DIR/v$MISE_VERSION" +curl -fsSL "https://mise.jdx.dev/v$MISE_VERSION/SHASUMS256.txt" >"$RELEASE_DIR/v$MISE_VERSION/SHASUMS256.txt" ./scripts/render-install.sh >tmp/install.sh chmod +x tmp/install.sh mise x shellcheck -- shellcheck tmp/install.sh