diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2018-06-12 15:25:43 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-06-12 15:25:43 +0200 |
| commit | bf4b65c18d8d8a2eb156883863c2de8814718e9a (patch) | |
| tree | 6e3d816c420a20ae9d5b71d862a741ba298b8d47 /installer | |
| parent | 9815cac93139ec0a4a155934819a887b6436081a (diff) | |
#843: Web interface uses new version file and correcting some errata.
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/opengnsys_import.sh | 3 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-devel-vbox | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/installer/opengnsys_import.sh b/installer/opengnsys_import.sh index b2a9463b..c3b343ee 100755 --- a/installer/opengnsys_import.sh +++ b/installer/opengnsys_import.sh @@ -220,7 +220,8 @@ if [ $? -ne 0 ]; then fi # Comprobamos si es la misma versión -OLDVERSION=$(jq -r '.version' $TMPDIR/VERSION.json) +[ -f $TMPDIR/VERSION.txt ] && OLDVERSION=$(awk '{print $2}' $TMPDIR/VERSION.txt) +[ -f $TMPDIR/VERSION.json ] && OLDVERSION=$(jq -r '.version' $TMPDIR/VERSION.json) NEWVERSION=$(jq -r '.version' $OPENGNSYS/doc/VERSION.json) # FALTA: Comprobar que la versión OLD es menor que la NEW if [ $OLDVERSION != $NEWVERSION ] ; then diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox index 4d41afd0..00d7dab6 100644 --- a/installer/vagrant/Vagrantfile-devel-vbox +++ b/installer/vagrant/Vagrantfile-devel-vbox @@ -25,7 +25,7 @@ LOCALWEBPORT = 8443 # OpenGnsys Server provisioning script: prepare repo disk, install OpenGnsys, change default interface, configure DHCP server. OGSERVERSCRIPT = <<EOT # Exit if OpenGnsys is installed. -[ -f /opt/opengnsys/doc/VERSION.txt ] && echo "Cannot provision, OpenGnsys is already installed." && exit 1 +[ -f /opt/opengnsys/doc/VERSION.json ] && echo "Cannot provision, OpenGnsys is already installed." && exit 1 # Create repository disk using LVM, if necesary. if [ -z "$(blkid /dev/mapper/og-images | grep ext4)" ]; then pvcreate /dev/sdb |