[+] Docker

taoyao-signal-server/docs/bin/startup.sh

@@ -6,16 +6,17 @@ base=${bin%/*}
 cd $base
 echo "启动目录：$base"
 
-# Java运行环境
-JAVA=$(which java)
-if [ -z "$JAVA" ] ; then
-  echo "必须安装${java.version}+JDK"
-  exit 1
-fi
-
 # 结束任务
 if [ ! -f "/.dockerenv" ]; then
-  sh bin/stop.sh
+  # Java运行环境
+  JAVA=$(which java)
+  if [ -z "$JAVA" ] ; then
+    echo "必须安装${java.version}+JDK"
+    exit 1
+  fi
+  bash bin/stop.sh
+else
+  JAVA="java"
 fi
 
 # 启动参数
@@ -38,7 +39,7 @@ fi
 
 # 等待任务
 if [ ! -f "/.dockerenv" ]; then
-  sh bin/wait.sh
+  bash bin/wait.sh
 else
   echo -e "\033[32m启动成功：${project.artifactId}-${project.version}\033[0m"
 fi

taoyao-signal-server/docs/bin/wait.sh

@@ -6,6 +6,7 @@ sleep 1
 # 等待任务
 startTime=$(date +%s)
 processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk '{print $2}')
+processPortNumber=0
 if [ ! -z "$processId" ]; then
   waitIndex=0
   processPortNumber=$(netstat -anop | grep $processId | grep LISTEN | wc -l)
@@ -23,9 +24,9 @@ if [ ! -z "$processId" ]; then
   done
   echo ""
 fi
-if [ "$processPortNumber" -lt 1 ]; then
+if [ $processPortNumber -lt 1 ]; then
   echo -e "\033[31m启动失败：${project.artifactId}-${project.version}\033[0m"
-  sh bin/stop.sh
+  bash bin/stop.sh
   exit 0
 else
   finishTime=$(date +%s)