fix: move rm -fr $SERVICE_NAME".jar" after existProcessUsePort check

apolloconfig · Apr 22, 2023 · 930b1c6 · 930b1c6
1 parent b26975f
commit 930b1c6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh
@@ -156,10 +156,6 @@ fi
 if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then
     exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
 else
-    if [[ -f $SERVICE_NAME".jar" ]]; then
-        rm -rf $SERVICE_NAME".jar"
-    fi
-
     # before running check there is another process use port or not
     if existProcessUsePort; then
         if isServiceRunning; then
@@ -178,6 +174,9 @@ else
 
     printf "$(date) ==== $SERVICE_NAME Starting ==== \n"
 
+    if [[ -f $SERVICE_NAME".jar" ]]; then
+        rm -rf $SERVICE_NAME".jar"
+    fi
     ln $PATH_TO_JAR $SERVICE_NAME".jar"
     chmod a+x $SERVICE_NAME".jar"
     ./$SERVICE_NAME".jar" start

diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh
@@ -156,10 +156,6 @@ fi
 if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then
     exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
 else
-    if [[ -f $SERVICE_NAME".jar" ]]; then
-        rm -rf $SERVICE_NAME".jar"
-    fi
-
     # before running check there is another process use port or not
     if existProcessUsePort; then
         if isServiceRunning; then
@@ -178,6 +174,9 @@ else
 
     printf "$(date) ==== $SERVICE_NAME Starting ==== \n"
 
+    if [[ -f $SERVICE_NAME".jar" ]]; then
+        rm -rf $SERVICE_NAME".jar"
+    fi
     ln $PATH_TO_JAR $SERVICE_NAME".jar"
     chmod a+x $SERVICE_NAME".jar"
     ./$SERVICE_NAME".jar" start

diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh
@@ -156,10 +156,6 @@ fi
 if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then
     exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR
 else
-    if [[ -f $SERVICE_NAME".jar" ]]; then
-        rm -rf $SERVICE_NAME".jar"
-    fi
-
     # before running check there is another process use port or not
     if existProcessUsePort; then
         if isServiceRunning; then
@@ -178,6 +174,9 @@ else
 
     printf "$(date) ==== $SERVICE_NAME Starting ==== \n"
 
+    if [[ -f $SERVICE_NAME".jar" ]]; then
+        rm -rf $SERVICE_NAME".jar"
+    fi
     ln $PATH_TO_JAR $SERVICE_NAME".jar"
     chmod a+x $SERVICE_NAME".jar"
     ./$SERVICE_NAME".jar" start