TOSCA-68 Modify start and stop script.so that we can run or stop catalog service at any path

Change-Id: I98fbf875f163a0e2116e0667d2e4c7e03d5d8e5d
Issue-id: TOSCA-68
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>

2 files changed, 7 insertions, 4 deletions

diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
index 25a9bd90..268bc82b 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
@@ -20,11 +20,11 @@ echo @RUNHOME@ $RUNHOME
 
 echo "### Starting catalog";
 cd catalog
-./stop.sh &
+$RUNHOME/catalog/stop.sh &
 cd $RUNHOME
 
 
 echo "\n\n### Starting catalog-http server"
 cd ./tomcat
-./bin/shutdown.sh &
+$RUNHOME/tomcat/bin/shutdown.sh &
 echo "### Starting catalog end...";
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
index 41696fb1..ed5daa7d 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
@@ -21,12 +21,15 @@ echo @RUNHOME@ $RUNHOME
 
 echo "### Starting catalog";
 cd catalog
-./run.sh &
+$RUNHOME/catalog/run.sh &
 cd $RUNHOME
 
 
 echo "\n\n### Starting catalog-http server"
 cd ./tomcat
-./bin/startup.sh &
+if [ ! -d "$RUNHOME/tomcat/logs" ]; then
+  mkdir $RUNHOME/tomcat/logs
+fi
+$RUNHOME/tomcat/bin/startup.sh &
 echo "### Starting catalog end...";