From 440ffd23f8540770e6bef60c65bb742c1d217718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Sat, 7 Jan 2023 16:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
appbuild-manager/src/main/bin/shutdown.sh | 1 +
appbuild-manager/src/main/bin/start.sh | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/appbuild-manager/src/main/bin/shutdown.sh b/appbuild-manager/src/main/bin/shutdown.sh
index 5c7cef8..71a5a2a 100644
--- a/appbuild-manager/src/main/bin/shutdown.sh
+++ b/appbuild-manager/src/main/bin/shutdown.sh
@@ -33,5 +33,6 @@ writelog "stoping application $PROJECT_NAME......"
kill -15 ${pid}
writelog "Send shutdown request to Server $PROJECT_NAME OK"
+exit 0;
diff --git a/appbuild-manager/src/main/bin/start.sh b/appbuild-manager/src/main/bin/start.sh
index ab512a1..4c80f65 100644
--- a/appbuild-manager/src/main/bin/start.sh
+++ b/appbuild-manager/src/main/bin/start.sh
@@ -36,8 +36,11 @@ if [ ! -d $TEMP_PATH ];
then
mkdir -p $TEMP_PATH;
fi
+#-z STRING 濡傛灉STRING鐨勯暱搴︿负闆跺垯涓虹湡 锛屽嵆鍒ゆ柇鏄惁涓虹┖锛岀┖鍗虫槸鐪燂紱
if [ -z "$JAVACMD" ] ; then
+ #-n STRING 濡傛灉STRING鐨勯暱搴﹂潪闆跺垯涓虹湡 锛屽嵆鍒ゆ柇鏄惁涓洪潪绌猴紝闈炵┖鍗虫槸鐪燂紱
if [ -n "$JAVA_HOME" ] ; then
+ #-x FILE 濡傛灉 FILE 瀛樺湪涓旀槸鍙墽琛岀殑鍒欎负鐪熴€�
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
JAVACMD="$JAVA_HOME/jre/sh/java"
else
@@ -45,11 +48,11 @@ if [ -z "$JAVACMD" ] ; then
fi
else
JAVACMD=`which java`
- writelog "Error: JAVA_HOME is not defined correctly."
+ writelog "Error: JAVA_HOME is not defined correctly.$JAVACMD"
#exit $ERR_NO_JAVA
fi
fi
-
+#-x FILE 濡傛灉 FILE 瀛樺湪涓旀槸鍙墽琛岀殑鍒欎负鐪熴€�
if [ ! -x "$JAVACMD" ] ; then
writelog "We cannot execute $JAVACMD"
exit $ERR_NO_JAVA
@@ -81,7 +84,7 @@ do
jcpid=`ps -ef | grep -v "grep" | grep "$MAIN_CLASS" | grep "app.port=$PORT" | sed -n '1P' | awk '{print $2}'`
if [ $jcpid ]; then
writelog "The $PROJECT_NAME start finished, PID is $jcpid"
- exit $SUCCESS
+ exit 0
else
writelog "starting the application .. $i"
sleep 1
--
2.24.3