[mapguide-commits] r9168 - in trunk/Tools/Vagrant: . scripts

[svn_mapguide at osgeo.org]

Author: jng
Date: 2017-04-22 09:12:54 -0700 (Sat, 22 Apr 2017)
New Revision: 9168

Modified:
   trunk/Tools/Vagrant/
   trunk/Tools/Vagrant/scripts/mginstallubuntu.sh
   trunk/Tools/Vagrant/scripts/provision_ubuntu.sh
Log:
Merged revision(s) 8967, 8972-8973 from branches/3.1/vagrant:
Fix release label not being properly stamped onto ubuntu install script as it was looking for a default label that doesn't exist.
........
Update ubuntu install script:
 - Add extra pre-requisite packages that were discovered to be required when testing on a clean barebones Ubuntu server installation.
........
Remove libc6 requirement from mginstallubuntu.sh. This package will always be present.
........



Property changes on: trunk/Tools/Vagrant
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0/vagrant:8601-8606
/branches/3.1/vagrant:8963
   + /branches/3.0/vagrant:8601-8606
/branches/3.1/vagrant:8963,8967,8972-8973

Modified: trunk/Tools/Vagrant/scripts/mginstallubuntu.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/mginstallubuntu.sh	2017-04-22 16:00:21 UTC (rev 9167)
+++ trunk/Tools/Vagrant/scripts/mginstallubuntu.sh	2017-04-22 16:12:54 UTC (rev 9168)
@@ -161,10 +161,10 @@
 if [ "$HEADLESS" != "1" ]
 then
 # Install required packages
-apt-get -y -q install dialog libexpat1 libssl1.0.0 odbcinst unixodbc libcurl3 libxslt1.1 libmysqlclient18 libpq5
+apt-get -y -q install openjdk-7-jre libxml2 dialog libexpat1 libssl1.0.0 odbcinst unixodbc libcurl3 libxslt1.1 libmysqlclient18 libpq5
 else
 # Install required packages 
-apt-get -y -q install libexpat1 libssl1.0.0 odbcinst unixodbc libcurl3 libxslt1.1 libmysqlclient18 libpq5
+apt-get -y -q install openjdk-7-jre libxml2 libexpat1 libssl1.0.0 odbcinst unixodbc libcurl3 libxslt1.1 libmysqlclient18 libpq5
 fi
 
 DIALOG=${DIALOG=dialog}

Modified: trunk/Tools/Vagrant/scripts/provision_ubuntu.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/provision_ubuntu.sh	2017-04-22 16:00:21 UTC (rev 9167)
+++ trunk/Tools/Vagrant/scripts/provision_ubuntu.sh	2017-04-22 16:12:54 UTC (rev 9168)
@@ -395,7 +395,7 @@
 echo [provision]: Stamping install script
 sudo cp $MOUNT_DIR/mginstallubuntu.sh $MOUNT_DIR/build/mginstallubuntu.sh
 sudo cp $MOUNT_DIR/mguninstallubuntu.sh $MOUNT_DIR/build/mguninstallubuntu.sh
-sudo sed -i 's/URL_PART="ubuntu12"/URL_PART='"$DISTNAME"'/g' $MOUNT_DIR/build/mginstallubuntu.sh
+sudo sed -i 's/URL_PART="ubuntu"/URL_PART='"$DISTNAME"'/g' $MOUNT_DIR/build/mginstallubuntu.sh
 sudo sed -i 's/MGRELEASELABEL="ReleaseLabel"/MGRELEASELABEL='"$MG_RELEASE_LABEL"'/g' $MOUNT_DIR/build/mginstallubuntu.sh
 sudo sed -i 's/FDOARCH=i386/FDOARCH='"$MG_ARCH"'/g' $MOUNT_DIR/build/mginstallubuntu.sh
 sudo sed -i 's/MGARCH=i386/MGARCH='"$MG_ARCH"'/g' $MOUNT_DIR/build/mginstallubuntu.sh