From 4620bf92a71adc5a9fc7f6957dd36342ea1a48e1 Mon Sep 17 00:00:00 2001 From: Jake Leahy Date: Sun, 15 Sep 2024 18:19:51 +1000 Subject: [PATCH 1/4] Just use the `latest-devel` tag --- install_nim.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install_nim.sh b/install_nim.sh index 67cbebc1..e936db98 100755 --- a/install_nim.sh +++ b/install_nim.sh @@ -1,4 +1,4 @@ -#!/bin/bash +linux_x64#!/bin/bash set -eu @@ -22,11 +22,11 @@ fetch_nightlies_releases() { } filter_latest_devel_assets() { - jq -r '[.[] | select(.tag_name | test("[0-9]{4}-[0-9]{2}-[0-9]{2}-devel-"))][0] | .assets' "$1" + jq -r '.[] | select(.tag_name | test("latest-devel-") | .assets' "$1" } filter_os_asset() { - jq --arg target "$1" -r '.[] | select(.name | test("-" + $target))' "$2" + jq --arg target "$1" -r '.[] | select(.name | test($target))' "$2" } info() { From 17ac5adb5fa5cc979271d3fde7af2da5d840c3d6 Mon Sep 17 00:00:00 2001 From: Jake Leahy Date: Sun, 15 Sep 2024 18:24:06 +1000 Subject: [PATCH 2/4] Fix missinput and missing brace --- install_nim.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install_nim.sh b/install_nim.sh index e936db98..43401fff 100755 --- a/install_nim.sh +++ b/install_nim.sh @@ -1,4 +1,4 @@ -linux_x64#!/bin/bash +#!/bin/bash set -eu @@ -22,7 +22,7 @@ fetch_nightlies_releases() { } filter_latest_devel_assets() { - jq -r '.[] | select(.tag_name | test("latest-devel-") | .assets' "$1" + jq -r '.[] | select(.tag_name | test("latest-devel-")) | .assets' "$1" } filter_os_asset() { From ab221ab586a8b734c18d630d6b5a3ae551fdef65 Mon Sep 17 00:00:00 2001 From: Jake Leahy Date: Sun, 15 Sep 2024 18:25:21 +1000 Subject: [PATCH 3/4] Fix another missinput --- install_nim.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_nim.sh b/install_nim.sh index 43401fff..8f075afb 100755 --- a/install_nim.sh +++ b/install_nim.sh @@ -22,7 +22,7 @@ fetch_nightlies_releases() { } filter_latest_devel_assets() { - jq -r '.[] | select(.tag_name | test("latest-devel-")) | .assets' "$1" + jq -r '.[] | select(.tag_name | test("latest-devel")) | .assets' "$1" } filter_os_asset() { From 4a9d90337e6cf8663c474794161e47401e7d248a Mon Sep 17 00:00:00 2001 From: Jake Leahy Date: Sun, 15 Sep 2024 18:37:07 +1000 Subject: [PATCH 4/4] Don't try and get an assert prefix The file doesn't match up exactly --- install_nim.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install_nim.sh b/install_nim.sh index 8f075afb..fbc69bcd 100755 --- a/install_nim.sh +++ b/install_nim.sh @@ -111,14 +111,14 @@ if [[ "$nim_version" = "devel" ]]; then asset_name="$(jq -r '.name' os_asset.json)" browser_download_url="$(jq -r '.browser_download_url' os_asset.json)" info "download nightlies build: asset_name = $asset_name, browser_download_url = $browser_download_url" - # asset_name ex: nim-2.1.9-linux_x64.tar.xz + # asset_name ex: linux_x64.tar.xz curl -sSL "$browser_download_url" > "$asset_name" - tar xf "$asset_name" + mkdir -p outfiles + tar xf "$asset_name" -C outfiles --strip-components=1 rm -f "$asset_name" - asset_prefix="$(echo "$asset_name" | grep -Eo '^nim-[0-9]+\.[0-9]+\.[0-9]+')" popd - mv "${work_dir}/${asset_prefix}"* "${nim_install_dir}" + mv "${work_dir}/outfiles" "${nim_install_dir}" rm -rf "$work_dir" else git clone -b devel --depth 1 https://github.com/nim-lang/Nim