diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2020-06-15 16:53:43 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2020-06-15 16:53:43 +0200 |
| commit | 1d1e06d319e3ba52619d4c7d7f3f790e675439d7 (patch) | |
| tree | 24d345705f00e0045612a63bdb331245c21a05fe /installer | |
| parent | 9fb80aa5ebd253f2267b73095ac0a4614e93bf0b (diff) | |
| parent | 828277b3fe7723fd855a1394d718f2e9b0be9730 (diff) | |
#983: Merge branch `v1.1.1c` into `master`.
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/opengnsys_update.sh | 14 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-1.1.1c-vbox (renamed from installer/vagrant/Vagrantfile-1.1.1b-vbox) | 2 | ||||
| l--------- | installer/vagrant/Vagrantfile-prod-vbox | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index b4159795..aa981c0a 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 + local RELEASES DOWNLOADS INSTVERSION INSTRELEASE RELDATE # Development branch. BRANCH="master" @@ -197,10 +197,10 @@ function chooseVersion() # Fetch tags (releases) data from GitHub. while read -pe TAG URL; do if [[ $TAG =~ ^opengnsys- ]]; then - [ "${TAG#opengnsys-}" \< "${INSTVERSION%pre}" ] && break - RELEASES+=( "${TAG}" ) - DOWNLOADS+=( "$URL" ) - #RELDATE=$(curl -s "$URL" | jq -r '.commit.committer.date | split("-") | join("")[:8]') + [ "${TAG#opengnsys-}" \< "${INSTVERSION%pre}" ] && continue + RELDATE=$(curl -s "$URL" | jq -r '.commit.committer.date | split("-") | join("")[:8]') + RELEASES+=( "${TAG} ($RELDATE)" ) + DOWNLOADS+=( "$URL" ) 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: " + PS3="Enter a number (CTRL-C to exit): " select opt in "${RELEASES[@]}"; do if [ -n "$opt" ]; then - BRANCH="$opt" + BRANCH="${opt%% *}" API_URL="${DOWNLOADS[REPLY-1]}" break fi diff --git a/installer/vagrant/Vagrantfile-1.1.1b-vbox b/installer/vagrant/Vagrantfile-1.1.1c-vbox index cfcb7da6..7db7b8f5 100644 --- a/installer/vagrant/Vagrantfile-1.1.1b-vbox +++ b/installer/vagrant/Vagrantfile-1.1.1c-vbox @@ -4,7 +4,7 @@ VAGRANTFILE_API_VERSION = "2" # VM provider: Oracle VM VirtualBox. ENV['VAGRANT_DEFAULT_PROVIDER'] = "virtualbox" # OpenGnsys version and OGAgent version. -OGVERSION="1.1.1b" +OGVERSION="1.1.1c" # Language (accepted values: es_ES, ca_ES, en_GB). LANGUAGE = "es_ES" ENV['LC_ALL'] = LANGUAGE + ".UTF-8" diff --git a/installer/vagrant/Vagrantfile-prod-vbox b/installer/vagrant/Vagrantfile-prod-vbox index 3fdb0e39..0d1bf07b 120000 --- a/installer/vagrant/Vagrantfile-prod-vbox +++ b/installer/vagrant/Vagrantfile-prod-vbox @@ -1 +1 @@ -Vagrantfile-1.1.1b-vbox
\ No newline at end of file +Vagrantfile-1.1.1c-vbox
\ No newline at end of file |