From 32b11c9bee1ab5986e4570a4bf861fa89d35fcf5 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 6 Sep 2021 13:30:26 +0200 Subject: [PATCH] fix: parse version listing properly --- CHANGELOG.md | 6 +++++- abra | 4 ++-- deploy/install.abra.coopcloud.tech/installer | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fb0b3c..2fd8bb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,11 @@ # abra x.x.x (UNRELEASED) -# abra 10.0.4 (????-??-??) +# abra 10.0.5 (2021-09-06) + +- Fix catalogue version listing parsing. + +# abra 10.0.4 (2021-09-06) - Understand how to parse the new catalogue versions listing. diff --git a/abra b/abra index 3813ba7..7648770 100755 --- a/abra +++ b/abra @@ -5,7 +5,7 @@ GIT_URL="https://git.coopcloud.tech/coop-cloud/" ABRA_APPS_URL="https://apps.coopcloud.tech" ABRA_DIR="${ABRA_DIR:-$HOME/.abra}" -ABRA_VERSION="10.0.4" +ABRA_VERSION="10.0.5" ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}" ABRA_VENDOR_DIR="$ABRA_DIR/vendor" ABRA_APPS_JSON="${ABRA_DIR}/apps.json" @@ -697,7 +697,7 @@ get_recipe_versions() { if [ "$recipe_json" = "null" ]; then declare -a RECIPE_VERSIONS else - mapfile -t RECIPE_VERSIONS < <(echo "$recipe_json" | $JQ -r ".versions | keys | .[]") + mapfile -t RECIPE_VERSIONS < <(echo "$recipe_json" | $JQ -r ".versions | .[] | keys | add") fi } diff --git a/deploy/install.abra.coopcloud.tech/installer b/deploy/install.abra.coopcloud.tech/installer index 194f627..e7533d8 100755 --- a/deploy/install.abra.coopcloud.tech/installer +++ b/deploy/install.abra.coopcloud.tech/installer @@ -2,7 +2,7 @@ # shellcheck disable=SC2154,SC2034 -ABRA_VERSION="10.0.4" +ABRA_VERSION="10.0.5" GIT_URL="https://git.coopcloud.tech/coop-cloud/abra" ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra" ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"