From 22cf903f6439338f704e98329404d603932e99b3 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 11 Mar 2015 15:10:49 +0000
Subject: [PATCH] Creating pom to autobuild bundle. Refs #3280

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution-bundle@113570 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 src/resources/setup.sh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/resources/setup.sh b/src/resources/setup.sh
index 13cd30c..8034064 100644
--- a/src/resources/setup.sh
+++ b/src/resources/setup.sh
@@ -16,13 +16,13 @@ export CATALINA_HOME=${SMARTGEAR_ROOT}/${TOMCAT_DST_FOLDER}"
 
 function showhelp {
 	echo -e "\nUsage:  setup.sh [-f |-h] \n"
-	echo    "  f                  = Really run the setup. By default it will be a dry-run"
-	echo -e "  h                  = shows this help.\n"
+	echo    "  f     = Really run the setup. By default it will be a dry-run"
+	echo -e "  h     = shows this help.\n"
 }
 
 while getopts ":d:fh" opt; do
 	case $opt in
-    	f) force=false;;
+    	f) force=true;;
     	h) showhelp
 exit 0 ;;
 		\?) echo -e "\nERROR:invalid option: -$OPTARG"; 
@@ -34,7 +34,7 @@ done
 
 echo ""
 
-if $force; then
+if [ $force ]; then
 	echo "Creating tomcat symlink..."
 	ln -s apache-tomcat-${TOMCAT_VERSION} ${TOMCAT_DST_FOLDER}
 	echo "Created"
@@ -49,7 +49,7 @@ if $force; then
 	source ~/.bashrc
 	
 	echo ""
-	echo "Entering on SmartGear Distribution Directory " ${SMARTGEAR_DISTRIBUTION_DIRECTORY}
+	echo "Entering on SmartGear Distribution Directory"
 	cd ${SMARTGEAR_DISTRIBUTION_DIRECTORY}
 	
 	echo ""
@@ -59,6 +59,10 @@ if $force; then
 	echo -e "\n\n\n\n"
 	echo "Just few steps to do to reach the goal:"
 else
+	echo "This is a dry-run showing the list of actions to do to setup SmartGear."
+	echo "Use -h to for the script help."
+	echo "Use -f to allow this script to perform required steps to setup Smartgear"
+	
 	echo "Create tomcat symlink with the following command"
 	echo "ln -s apache-tomcat-${TOMCAT_VERSION} ${TOMCAT_DST_FOLDER}"
 		
@@ -67,7 +71,7 @@ else
 	echo "${ENV_VARIABLES}"
 	
 	echo ""
-	echo "Load new variables with the following command"
+	echo "Load new environments"
 	echo "source ~/.bashrc"
 	
 	echo ""
@@ -78,7 +82,10 @@ else
 	echo "Launch SmartGear install for Tomcat...."
 	echo "./install -s tomcat"
 	
-	echo -e "\n\n\n\n"
+	echo ""
+	echo "The previous steps can be made by launching this script with -f option"
+	
+	echo -e "\n\n"
 	echo "Then:"
 	
 fi
@@ -87,10 +94,10 @@ echo "- Modify ${CONTAINER_XML} with your hostname"
 echo "- Modify ${CONTAINER_XML} startup infrastructure and vres"
 
 CATALINA_STARTUP_SCRIPT="${TOMCAT_DST_FOLDER}/bin/startup.sh"
-echo "- Launch tomcat from ${SMATGEAR_ROOT} using the command ${CATALINA_STARTUP_SCRIPT}"
+echo "- Launch Tomcat from ${SMATGEAR_ROOT} using the command ${CATALINA_STARTUP_SCRIPT}"
 
 echo ""
-echo "By default tomcat start on 8080 port.
+echo "By default Tomcat start on 8080 port.
 If you want to change this port REMEMBER to modify ${CONTAINER_XML} consistently"