From 6022759b1f975bb9b974e223d38964699fd8a658 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Tue, 3 May 2016 17:38:06 +0800 Subject: [PATCH] compatibility for cd portal envionment --- apollo-adminservice/src/main/scripts/shutdown.sh | 5 +++++ apollo-adminservice/src/main/scripts/startup.sh | 6 +++++- apollo-configservice/src/main/scripts/shutdown.sh | 7 ++++++- apollo-configservice/src/main/scripts/startup.sh | 6 +++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/apollo-adminservice/src/main/scripts/shutdown.sh b/apollo-adminservice/src/main/scripts/shutdown.sh index bd02f4dab..dabf190c1 100644 --- a/apollo-adminservice/src/main/scripts/shutdown.sh +++ b/apollo-adminservice/src/main/scripts/shutdown.sh @@ -2,6 +2,11 @@ SERVICE_NAME=apollo-adminservice cd `dirname $0`/.. + +if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then + cd current +fi + if [[ -f $SERVICE_NAME".jar" ]]; then ./$SERVICE_NAME".jar" stop fi diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh index 42983d838..9162fdfc1 100644 --- a/apollo-adminservice/src/main/scripts/startup.sh +++ b/apollo-adminservice/src/main/scripts/startup.sh @@ -5,6 +5,10 @@ PATH_TO_JAR=$SERVICE_NAME"-"$VERSION".jar" cd `dirname $0`/.. +if [[ ! -f PATH_TO_JAR && -d current ]]; then + cd current +fi + if [[ -f $SERVICE_NAME".jar" ]]; then rm -rf $SERVICE_NAME".jar" fi @@ -12,4 +16,4 @@ fi ln $PATH_TO_JAR $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" start -exit 0; \ No newline at end of file +exit 0; diff --git a/apollo-configservice/src/main/scripts/shutdown.sh b/apollo-configservice/src/main/scripts/shutdown.sh index 0624ee86c..0093868dc 100644 --- a/apollo-configservice/src/main/scripts/shutdown.sh +++ b/apollo-configservice/src/main/scripts/shutdown.sh @@ -2,6 +2,11 @@ SERVICE_NAME=apollo-configservice cd `dirname $0`/.. + +if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then + cd current +fi + if [[ -f $SERVICE_NAME".jar" ]]; then ./$SERVICE_NAME".jar" stop -fi \ No newline at end of file +fi diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh index 1c7559b3d..877c1dd9e 100644 --- a/apollo-configservice/src/main/scripts/startup.sh +++ b/apollo-configservice/src/main/scripts/startup.sh @@ -5,6 +5,10 @@ PATH_TO_JAR=$SERVICE_NAME"-"$VERSION".jar" cd `dirname $0`/.. +if [[ ! -f PATH_TO_JAR && -d current ]]; then + cd current +fi + if [[ -f $SERVICE_NAME".jar" ]]; then rm -rf $SERVICE_NAME".jar" fi @@ -12,4 +16,4 @@ fi ln $PATH_TO_JAR $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" start -exit 0; \ No newline at end of file +exit 0; -- GitLab