From 343047797cba96e2c11ae123995aff8c3a6c0ad8 Mon Sep 17 00:00:00 2001 From: Joseph Tate Date: Mon, 26 Feb 2024 17:05:55 -0500 Subject: [PATCH 1/3] Attempt to add arm arches to asdf install command --- bin/install | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/bin/install b/bin/install index 6f677ed..e3628ed 100755 --- a/bin/install +++ b/bin/install @@ -33,7 +33,7 @@ install_tool() { local download_url local download_path - platform=$(get_platform) + platform=$(get_platform)$(get_arch) download_url=$(get_download_url "$version" "$platform" "$binary_name") download_path="$tmp_download_dir/"$(get_filename "$version" "$platform" "$binary_name") @@ -54,16 +54,29 @@ install_tool() { get_platform() { if [[ "$(uname)" == "Linux" ]] then - echo "linux-amd64" + echo "linux" else - echo "darwin-amd64" + echo "darwin" fi } +get_arch() { + local arch=$(uname -m) + + case $arch in + amd64 | x86_64) + echo '-amd64' + ;; + arm64 | aarch64) + echo '-arm64' + ;; + esac +} + get_filename() { local version="$1" local platform="$2" - local binary_name="$3" + local binary_name="$4" echo "${binary_name}-v${version}-${platform}" } From 7569d83cee111a3f7874ec2d85683090ee6bfcbe Mon Sep 17 00:00:00 2001 From: Joseph Tate Date: Mon, 26 Feb 2024 17:09:06 -0500 Subject: [PATCH 2/3] Rework arch to simplify hyphenation --- bin/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/install b/bin/install index e3628ed..1c60a3e 100755 --- a/bin/install +++ b/bin/install @@ -33,7 +33,7 @@ install_tool() { local download_url local download_path - platform=$(get_platform)$(get_arch) + platform=$(get_platform)-$(get_arch) download_url=$(get_download_url "$version" "$platform" "$binary_name") download_path="$tmp_download_dir/"$(get_filename "$version" "$platform" "$binary_name") @@ -65,10 +65,10 @@ get_arch() { case $arch in amd64 | x86_64) - echo '-amd64' + echo 'amd64' ;; arm64 | aarch64) - echo '-arm64' + echo 'arm64' ;; esac } From 1e0b344f023690a0eed106cd5e295daacfaf61ce Mon Sep 17 00:00:00 2001 From: Joseph Tate Date: Mon, 26 Feb 2024 17:16:55 -0500 Subject: [PATCH 3/3] Fix typo --- bin/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/install b/bin/install index 1c60a3e..eafc278 100755 --- a/bin/install +++ b/bin/install @@ -76,7 +76,7 @@ get_arch() { get_filename() { local version="$1" local platform="$2" - local binary_name="$4" + local binary_name="$3" echo "${binary_name}-v${version}-${platform}" }