From 4f6bad9dc5f1f76618a7d54ebf8c623c15a22198 Mon Sep 17 00:00:00 2001 From: "Ramón M. Gómez" Date: Tue, 9 Jun 2020 11:19:57 +0200 Subject: Revert "#959: Fix update bug when obtaining Git tags data." This reverts commit d4daa3475e859b94226aa081dd7d0765f0be4581. --- installer/opengnsys_update.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'installer/opengnsys_update.sh') diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index fb6891f0..b4159795 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -182,7 +182,7 @@ function autoConfigure() # Choose an available version to update. function chooseVersion() { - local RELEASES DOWNLOADS INSTVERSION INSTRELEASE RELDATE + local RELEASES DOWNLOADS INSTVERSION INSTRELEASE # Development branch. BRANCH="master" @@ -198,9 +198,9 @@ function chooseVersion() while read -pe TAG URL; do if [[ $TAG =~ ^opengnsys- ]]; then [ "${TAG#opengnsys-}" \< "${INSTVERSION%pre}" ] && break - RELDATE=$(curl -s "$URL" | jq -r '.commit.committer.date | split("-") | join("")[:8]') - RELEASES+=( "${TAG} ($RELDATE)" ) - DOWNLOADS+=( "$URL" ) + RELEASES+=( "${TAG}" ) + DOWNLOADS+=( "$URL" ) + #RELDATE=$(curl -s "$URL" | jq -r '.commit.committer.date | split("-") | join("")[:8]') fi done <<< $(curl -s "$API_URL/../../tags" | jq -r '.[] | .name+" "+.commit.url') # Add development (master) branch. @@ -210,10 +210,10 @@ function chooseVersion() if [ ${#RELEASES[@]} -gt 1 ]; then echo "Installed version: $INSTVERSION $INSTRELEASE" echo "Versions available for update (\"$BRANCH\" is the latest development branch):" - PS3="Enter a number (CTRL-C to exit): " + PS3="Enter a number: " select opt in "${RELEASES[@]}"; do if [ -n "$opt" ]; then - BRANCH="${opt%% *}" + BRANCH="$opt" API_URL="${DOWNLOADS[REPLY-1]}" break fi -- cgit v1.2.3-18-g5258