gCubeSystem
/
smartgears-distribution-bundle
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refs #2179: Replace values of environment variable instead of appending to ~/.bashrc 

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

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution-bundle@122946 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-02-09 09:32:16 +00:00
parent 6aede68b5c
commit aa010e6e05
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/resources/setup.sh
View File

@ -13,11 +13,11 @@ GHN_HOME=${SMARTGEAR_ROOT}/SmartGears
CONTAINER_FILENAME="container.xml"
CONTAINER_XML=${GHN_HOME}/${CONTAINER_FILENAME}
ENV_VARIABLES="export CATALINA_OPTS=\"-Xmx2000m -Xms2000m\"
export GHN_HOME=${GHN_HOME}
export CATALINA_PID=${SMARTGEAR_ROOT}/${TOMCAT_PID_FILENAME}
export CATALINA_HOME=${SMARTGEAR_ROOT}/${TOMCAT_DST_FOLDER}
export BUNDLE_HOME=${SMARTGEAR_ROOT}"
CATALINA_OPTS_BASHRC="export CATALINA_OPTS=\"-Xmx2000m -Xms2000m\""
GHN_HOME_BASHRC="export GHN_HOME=${GHN_HOME}"
CATALINA_PID_BASHRC="export CATALINA_PID=${SMARTGEAR_ROOT}/${TOMCAT_PID_FILENAME}"
CATALINA_HOME_BASHRC="export CATALINA_HOME=${SMARTGEAR_ROOT}/${TOMCAT_DST_FOLDER}"
BUNDLE_HOME_BASHRC="export BUNDLE_HOME=${SMARTGEAR_ROOT}"
function showhelp {
echo -e "\nUsage: setup.sh [-n <hostname>] [-f | -h] \n"
@ -93,15 +93,27 @@ if [ $force ]; then
echo -e "\n"
echo "Adding the following variables to environment..."
echo "${ENV_VARIABLES}"
echo "${ENV_VARIABLES}" >> ~/.bashrc
sed -i '/export CATALINA_OPT/d' ~/.bashrc
echo "${CATALINA_OPTS_BASHRC}"
echo "${CATALINA_OPTS_BASHRC}" >> ~/.bashrc
sed -i '/export GHN_HOME/d' ~/.bashrc
echo "${GHN_HOME_BASHRC}"
echo "${GHN_HOME_BASHRC}" >> ~/.bashrc
sed -i '/export CATALINA_PID/d' ~/.bashrc
echo "${CATALINA_PID_BASHRC}"
echo "${CATALINA_PID_BASHRC}" >> ~/.bashrc
sed -i '/export CATALINA_HOME/d' ~/.bashrc
echo "${CATALINA_HOME_BASHRC}"
echo "${CATALINA_HOME_BASHRC}" >> ~/.bashrc
sed -i '/export BUNDLE_HOME/d' ~/.bashrc
echo "${BUNDLE_HOME_BASHRC}"
echo "${BUNDLE_HOME_BASHRC}" >> ~/.bashrc
echo "done."
echo -e "\n"
echo "Creating GHN_HOME ${GHN_HOME}"
mkdir -p ${GHN_HOME}
echo -e "\n"
echo "Loading new environment..."
source ~/.bashrc
@ -139,6 +151,12 @@ else
echo ""
echo "Add the following variables to your ~/.bashrc"
echo "${ENV_VARIABLES}"
echo "${CATALINA_OPTS_BASHRC}"
echo "${GHN_HOME_BASHRC}"
echo "${CATALINA_PID_BASHRC}"
echo "${CATALINA_HOME_BASHRC}"
echo "${BUNDLE_HOME_BASHRC}"
echo ""
echo "Create GHN_HOME ${GHN_HOME}"