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
This commit is contained in:
parent
d68e15bdb2
commit
8743493e11
|
@ -1,4 +1,5 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
|
||||||
<Changeset component="org.gcube.distribution.smartgears-distribution.1-0-0" date="2013-10-24">
|
<Changeset component="org.gcube.distribution.smartgears-distribution.1-0-0" date="2013-10-24">
|
||||||
<Change>First Release</Change>
|
<Change>First Release</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
|
@ -20,4 +21,7 @@
|
||||||
<Changeset component="org.gcube.distribution.smartgears-distribution.1-2-3" date="2015-06-18">
|
<Changeset component="org.gcube.distribution.smartgears-distribution.1-2-3" date="2015-06-18">
|
||||||
<Change>Stripped version from name of the included war</Change>
|
<Change>Stripped version from name of the included war</Change>
|
||||||
</Changeset>
|
</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>
|
</ReleaseNotes>
|
|
@ -1,3 +1,4 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
#set distro to script's parent directory
|
#set distro to script's parent directory
|
||||||
distro=$(cd ${0%/*} && echo $PWD/${0##*/})
|
distro=$(cd ${0%/*} && echo $PWD/${0##*/})
|
||||||
|
@ -63,12 +64,16 @@ fi
|
||||||
|
|
||||||
#tomcat target
|
#tomcat target
|
||||||
if [ "$shared" = "tomcat" ]; then
|
if [ "$shared" = "tomcat" ]; then
|
||||||
if [ -z "$CATALINA_HOME" ]; then
|
if [ -z "$CATALINA_HOME" ]; then
|
||||||
echo -e "\nERROR: env var CATALINA_HOME is undefined." >&2
|
if [ -z "$WEB_CONTAINER_HOME" ] ; then
|
||||||
showhelp
|
echo -e "\nERROR: both CATALINA_HOME and WEB_CONTAINER_HOME are undefined." >&2
|
||||||
echo -e "\naborting.\n"
|
showhelp
|
||||||
exit 1
|
echo -e "\naborting.\n"
|
||||||
fi
|
exit 1
|
||||||
|
else
|
||||||
|
CATALINA_HOME=$WEB_CONTAINER_HOME
|
||||||
|
fi
|
||||||
|
fi
|
||||||
shared=$CATALINA_HOME/lib
|
shared=$CATALINA_HOME/lib
|
||||||
apps=$CATALINA_HOME/webapps
|
apps=$CATALINA_HOME/webapps
|
||||||
fi
|
fi
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -8,7 +8,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>smartgears-distribution</artifactId>
|
<artifactId>smartgears-distribution</artifactId>
|
||||||
<version>1.2.3-SNAPSHOT</version>
|
<version>1.2.4-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>A distribution for the SmartGears Framework</name>
|
<name>A distribution for the SmartGears Framework</name>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue