diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2021-04-07 09:18:07 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2021-04-07 09:18:07 +0200 |
| commit | cfb16c0123fb07ac876f42c7bd9a602731b5f359 (patch) | |
| tree | a3116c60c2cf69bbba00ac78d6d2a08a2a51cd13 /installer | |
| parent | 280a77fbb2f13fe99641f576247676d03b475c93 (diff) | |
#997: Using tags with format `vX.Y.Z` instead of `opengnsys-X.Y.Z`
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/opengnsys_update.sh | 3 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-1.2.0-vbox | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 4b244b28..0ae41c18 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -221,8 +221,9 @@ function chooseVersion() [ -f $INSTALL_TARGET/doc/VERSION.txt ] && read -pe INSTVERSION INSTRELEASE <<< $(awk '{print $2,$3}' $INSTALL_TARGET/doc/VERSION.txt) # Fetch tags (releases) data from GitHub. while read -pe TAG URL; do - if [[ $TAG =~ ^opengnsys- ]]; then + if [[ $TAG =~ ^(opengnsys-|v)[0-9] ]]; then [ "${TAG#opengnsys-}" \< "${INSTVERSION%pre}" ] && continue + [ "${TAG#v}" \< "${INSTVERSION%pre}" ] && continue RELDATE=$(curl -s "$URL" | jq -r '.commit.committer.date | split("-") | join("")[:8]') RELEASES+=( "${TAG} ($RELDATE)" ) DOWNLOADS+=( "$URL" ) diff --git a/installer/vagrant/Vagrantfile-1.2.0-vbox b/installer/vagrant/Vagrantfile-1.2.0-vbox index 3cecfdd2..b6659841 100644 --- a/installer/vagrant/Vagrantfile-1.2.0-vbox +++ b/installer/vagrant/Vagrantfile-1.2.0-vbox @@ -46,7 +46,7 @@ if which curl &>/dev/null; then elif which wget &>/dev/null; then DOWNLOAD="wget -q -O -" fi -BRANCH="opengnsys-#{OGVERSION}" +BRANCH="v#{OGVERSION}" $DOWNLOAD "https://raw.githubusercontent.com/opengnsys/OpenGnsys/$BRANCH/installer/opengnsys_installer.sh" | bash || exit $? mv /opt/opengnsys/log/bash.log /opt/opengnsys/log/opengnsys_installer.log echo y | /opt/opengnsys/bin/setserveraddr $(ip -o link show | tail -1 | cut -d: -f2) |