👌 跟新脚本

dunwu · dunwu · commit cbc3b82604af · 2018-01-31T10:01:06.000+08:00
diff --git a/scripts/git-clone.sh b/scripts/git-clone.sh
@@ -81,7 +81,9 @@ doCheckout() {
 
 ##############################__MAIN__########################################
 export LANG="zh_CN.UTF-8"
+# Github 账户
 ACCOUNT=dunwu
+# 源码默认根目录
 SOURCE_PATH=/home/zp/source
 
 # 必填输入参数
diff --git a/scripts/init.sh b/scripts/init.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#################################################################################
+# javatool-server 项目初始化脚本
+# 执行本脚本后，会将 java-stack 下载到 /home/zp/source/java-stack 目录下。
+# 环境中必须安装了 git
+#################################################################################
+
+rm -rf /home/temp
+rm -rf /home/zp/source/java-stack
+mkdir -p /home/temp
+cd /home/temp
+wget https://raw.githubusercontent.com/dunwu/java-stack/master/scripts/git-clone.sh
+chmod 777 git-clone.sh
+./git-clone.sh java-stack master
+chmod 777 /home/zp/source/java-stack
+rm -rf /home/temp
diff --git a/scripts/javatool-server-release.sh b/scripts/javatool-server-release.sh
@@ -19,13 +19,22 @@ checkInput() {
 # 检查文件是否存在，不存在则退出脚本
 #
 checkFileExist() {
-  if [ ! -f "$1" ]
-  then
+  if [ ! -f "$1" ];then
     echo "关键文件 $1 找不到，脚本执行结束"
     exit 0
   fi
 }
 
+#
+# 检查目录是否存在，不存在则退出脚本
+#
+checkFolderExist() {
+  if [ ! -d "$1" ];then
+    echo "关键目录 $1 找不到，脚本执行结束"
+    exit 0
+  fi
+}
+
 #
 # 记录发布的版本信息
 #
@@ -59,18 +68,20 @@ branch=`echo $1`
 profile=`echo $2`
 repository=`echo $3`
 checkInput
+checkFolderExist ${SOURCE_PATH}
+checkFolderExist ${SCRIPT_PATH}
+checkFileExist ${SCRIPT_PATH}/git-clone.sh
+checkFileExist ${SCRIPT_PATH}/javatool-server-run.sh
+checkFileExist ${SCRIPT_PATH}/embed-tomcat-server-boot.sh
 
 # 1. 停止应用
-checkFileExist "${SCRIPT_PATH}/javatool-server-run.sh"
-echo "停止所有 javatool-server 应用开始"
-${SCRIPT_PATH}/javatool-server-run.sh ${profile} stop
-echo "停止所有 javatool-server 应用结束"
+#echo "停止所有 javatool-server 应用开始"
+#${SCRIPT_PATH}/javatool-server-run.sh ${profile} stop
+#echo "停止所有 javatool-server 应用结束"
 
 # 2. 更新代码
 cd ${SOURCE_PATH}
-UPDATE_CODE_SCRIPT_PATH=/home/zp/script/common/git-clone.sh
-checkFileExist ${UPDATE_CODE_SCRIPT_PATH}
-${UPDATE_CODE_SCRIPT_PATH} dunwu javatool-server ${branch}
+${SCRIPT_PATH}/git-clone.sh java-stack ${branch}
 chmod -R 777 ${SOURCE_PATH}
 
 # 3. 替换配置
@@ -81,7 +92,6 @@ cd ${SOURCE_PATH}/codes/javatool
 mvn clean package -Dmaven.test.skip=true
 
 # 5. 启动应用
-checkFileExist "${SCRIPT_PATH}/javatool-server-run.sh"
 echo "启动所有 javatool-server 应用开始"
 # 手动释放内存
 echo 3 > /proc/sys/vm/drop_caches
diff --git a/scripts/javatool-server-run.sh b/scripts/javatool-server-run.sh
@@ -42,7 +42,7 @@ execBootScript(){
   # 启动类
   bootstrapClass="io.github.dunwu.javatool.server.TomcatServer"
 
-  ${BOOT_SCRIPT} ${APP_NAME} ${oper} "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
+  ${SCRIPT_PATH}/embed-tomcat-server-boot.sh ${APP_NAME} ${oper} "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
 }
 
 ######################################## MAIN ########################################
@@ -60,7 +60,7 @@ export LANG="zh_CN.UTF-8"
 #export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$MAVEN_HOME/bin:$PATH
 
 # 关键路径
-BOOT_SCRIPT=./embed-tomcat-server-boot.sh
+SCRIPT_PATH=/home/zp/source/java-stack/scripts
 COMPILED_WEBAPP=/home/zp/source/java-stack/codes/javatool/server/target/javatool-server
-RESOURCES_PATH=/home/zp/source/union/modules/athena/src/main/resources
+RESOURCES_PATH=/home/zp/source/java-stack/codes/javatool/server/src/main/resources
 execBootScript
