From 0f26d381e17941a5f99838b123f5c9eab96c1410 Mon Sep 17 00:00:00 2001
From: Iannis Drakos <drakos@informatics.bio>
Date: Mon, 5 Jun 2017 17:14:10 +0200
Subject: [PATCH 1/2] Check grails version fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“grails --version” does not return version number, when running grails version 2.3.11 / Ubuntu 14.04.

Thus, checkVersions.sh will always fail.

Getting grails version from SDKman instead, so checks can succeed when grails 2.3.11 is installed.
---
 install-ubuntu/checks/checkVersions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-ubuntu/checks/checkVersions.sh b/install-ubuntu/checks/checkVersions.sh
index 7529281..8621cf7 100755
--- a/install-ubuntu/checks/checkVersions.sh
+++ b/install-ubuntu/checks/checkVersions.sh
@@ -54,7 +54,7 @@ let "returnFlag=$returnFlag + $?"
 
 # check grails version, exactly 2.3.11
 desiredGrailsVersion="2.3.11"
-grailsVersion=$(grails --version | awk -F '^Grails version: ' '{print $2}')
+grailsVersion=$(sdk current grails | awk -F '^Using grails version ' '{print $2}')
 reportCheckExact "grails" $desiredGrailsVersion $grailsVersion
 
 let "returnFlag=$returnFlag + $?"

From d93ef95fcef4704cf316bfc731df00b4236ce9c5 Mon Sep 17 00:00:00 2001
From: Iannis Drakos <drakos@informatics.bio>
Date: Mon, 5 Jun 2017 17:23:15 +0200
Subject: [PATCH 2/2] checkWeb.sh fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Checking if the tranSMART web site is running will fail, on some builds, when the page title is not displayed with the expected case, e.g. “Transmart”.

Making the grep call case-insensitive can fix that.
---
 install-ubuntu/checks/checkWeb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-ubuntu/checks/checkWeb.sh b/install-ubuntu/checks/checkWeb.sh
index 1822d85..1fe1fa1 100755
--- a/install-ubuntu/checks/checkWeb.sh
+++ b/install-ubuntu/checks/checkWeb.sh
@@ -64,7 +64,7 @@ else
 	echo "The tranSMART web site ($transmartUrl) is running"
 fi
 
-probe=$(curl -L $transmartUrl | grep "title" | grep "tranSMART")
+probe=$(curl -L $transmartUrl | grep "title" | grep -i "tranSMART")
 if [ -z "$probe" ] ; then
 	echo "The tranSMART web site (at $transmartUrl) is not delivering the login home page;"
 	echo "  see tomcat log file, /var/lib/tomcat7/logs/transmart.log for possible errors "