fixes #406: Smartgears distribution: add the WEB_CONTAINER check on install script

https://support.d4science.org/issues/406

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution@117413 82a268e6-3cf1-43bd-a215-b396298e98cf

distro/changelog.xml

@@ -1,4 +1,5 @@
 <ReleaseNotes>
+
 	<Changeset component="org.gcube.distribution.smartgears-distribution.1-0-0" date="2013-10-24">
 		<Change>First Release</Change>
 	</Changeset>
@@ -20,4 +21,7 @@
 	<Changeset component="org.gcube.distribution.smartgears-distribution.1-2-3" date="2015-06-18">
 		<Change>Stripped version from name of the included war</Change>
 	</Changeset>
+	<Changeset component="org.gcube.distribution.smartgears-distribution.1-2-4" date="2015-07-22">
+		<Change>Added possibility to use WEB_CONTAINER_HOME to specify the container folder. This environment variable has priority over CATALINA_HOME in the install script.</Change>
+	</Changeset>
 </ReleaseNotes>

distro/contents/install

@@ -1,3 +1,4 @@
+#!/bin/bash
 
 #set distro to script's parent directory
 distro=$(cd ${0%/*} && echo $PWD/${0##*/})
@@ -63,12 +64,16 @@ fi
  
 #tomcat target
 if [ "$shared" = "tomcat" ]; then 
-	if [ -z "$CATALINA_HOME" ]; then 
-		echo -e "\nERROR: env var CATALINA_HOME is undefined." >&2
-		showhelp
-		echo -e "\naborting.\n"
-		exit 1
-	fi
+	if [ -z "$CATALINA_HOME" ]; then
+        if [ -z "$WEB_CONTAINER_HOME" ] ; then
+		    echo -e "\nERROR: both CATALINA_HOME and WEB_CONTAINER_HOME are undefined." >&2
+		    showhelp
+		    echo -e "\naborting.\n"
+		    exit 1
+        else
+	        CATALINA_HOME=$WEB_CONTAINER_HOME
+	    fi
+    fi
 	shared=$CATALINA_HOME/lib
 	apps=$CATALINA_HOME/webapps
 fi

pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>smartgears-distribution</artifactId>
-	<version>1.2.3-SNAPSHOT</version>
+	<version>1.2.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>A distribution for the SmartGears Framework</name>