diff --git a/distro/changelog.xml b/distro/changelog.xml
index 84ee8ac..0c59b6f 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,5 @@
+
First Release
@@ -20,4 +21,7 @@
Stripped version from name of the included war
+
+ Added possibility to use WEB_CONTAINER_HOME to specify the container folder. This environment variable has priority over CATALINA_HOME in the install script.
+
\ No newline at end of file
diff --git a/distro/contents/install b/distro/contents/install
index ae342ba..c85e335 100755
--- a/distro/contents/install
+++ b/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
diff --git a/pom.xml b/pom.xml
index a5672c6..42ac707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
org.gcube.distribution
smartgears-distribution
- 1.2.3-SNAPSHOT
+ 1.2.4-SNAPSHOT
pom
A distribution for the SmartGears Framework