Skip to content

Commit cbc3b82

Browse files
dunwudunwu
committed
👌 跟新脚本
1 parent 5f5cf28 commit cbc3b82

4 files changed

Lines changed: 41 additions & 13 deletions

File tree

‎scripts/git-clone.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ doCheckout() {
8181

8282
##############################__MAIN__########################################
8383
export LANG="zh_CN.UTF-8"
84+
# Github 账户
8485
ACCOUNT=dunwu
86+
# 源码默认根目录
8587
SOURCE_PATH=/home/zp/source
8688

8789
# 必填输入参数

‎scripts/init.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
#################################################################################
3+
# javatool-server 项目初始化脚本
4+
# 执行本脚本后，会将 java-stack 下载到 /home/zp/source/java-stack 目录下。
5+
# 环境中必须安装了 git
6+
#################################################################################
7+
8+
rm -rf /home/temp
9+
rm -rf /home/zp/source/java-stack
10+
mkdir -p /home/temp
11+
cd /home/temp
12+
wget https://raw.githubusercontent.com/dunwu/java-stack/master/scripts/git-clone.sh
13+
chmod 777 git-clone.sh
14+
./git-clone.sh java-stack master
15+
chmod 777 /home/zp/source/java-stack
16+
rm -rf /home/temp

‎scripts/javatool-server-release.sh‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,22 @@ checkInput() {
1919
# 检查文件是否存在，不存在则退出脚本
2020
#
2121
checkFileExist() {
22-
if [ ! -f "$1" ]
23-
then
22+
if [ ! -f "$1" ];then
2423
echo "关键文件 $1 找不到，脚本执行结束"
2524
exit 0
2625
fi
2726
}
2827

28+
#
29+
# 检查目录是否存在，不存在则退出脚本
30+
#
31+
checkFolderExist() {
32+
if [ ! -d "$1" ];then
33+
echo "关键目录 $1 找不到，脚本执行结束"
34+
exit 0
35+
fi
36+
}
37+
2938
#
3039
# 记录发布的版本信息
3140
#
@@ -59,18 +68,20 @@ branch=`echo $1`
5968
profile=`echo $2`
6069
repository=`echo $3`
6170
checkInput
71+
checkFolderExist ${SOURCE_PATH}
72+
checkFolderExist ${SCRIPT_PATH}
73+
checkFileExist ${SCRIPT_PATH}/git-clone.sh
74+
checkFileExist ${SCRIPT_PATH}/javatool-server-run.sh
75+
checkFileExist ${SCRIPT_PATH}/embed-tomcat-server-boot.sh
6276

6377
# 1. 停止应用
64-
checkFileExist "${SCRIPT_PATH}/javatool-server-run.sh"
65-
echo "停止所有 javatool-server 应用开始"
66-
${SCRIPT_PATH}/javatool-server-run.sh ${profile} stop
67-
echo "停止所有 javatool-server 应用结束"
78+
#echo "停止所有 javatool-server 应用开始"
79+
#${SCRIPT_PATH}/javatool-server-run.sh ${profile} stop
80+
#echo "停止所有 javatool-server 应用结束"
6881

6982
# 2. 更新代码
7083
cd ${SOURCE_PATH}
71-
UPDATE_CODE_SCRIPT_PATH=/home/zp/script/common/git-clone.sh
72-
checkFileExist ${UPDATE_CODE_SCRIPT_PATH}
73-
${UPDATE_CODE_SCRIPT_PATH} dunwu javatool-server ${branch}
84+
${SCRIPT_PATH}/git-clone.sh java-stack ${branch}
7485
chmod -R 777 ${SOURCE_PATH}
7586

7687
# 3. 替换配置
@@ -81,7 +92,6 @@ cd ${SOURCE_PATH}/codes/javatool
8192
mvn clean package -Dmaven.test.skip=true
8293

8394
# 5. 启动应用
84-
checkFileExist "${SCRIPT_PATH}/javatool-server-run.sh"
8595
echo "启动所有 javatool-server 应用开始"
8696
# 手动释放内存
8797
echo 3 > /proc/sys/vm/drop_caches

‎scripts/javatool-server-run.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ execBootScript(){
4242
# 启动类
4343
bootstrapClass="io.github.dunwu.javatool.server.TomcatServer"
4444

45-
${BOOT_SCRIPT} ${APP_NAME} ${oper} "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
45+
${SCRIPT_PATH}/embed-tomcat-server-boot.sh ${APP_NAME} ${oper} "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
4646
}
4747

4848
######################################## MAIN ########################################
@@ -60,7 +60,7 @@ export LANG="zh_CN.UTF-8"
6060
#export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$MAVEN_HOME/bin:$PATH
6161

6262
# 关键路径
63-
BOOT_SCRIPT=./embed-tomcat-server-boot.sh
63+
SCRIPT_PATH=/home/zp/source/java-stack/scripts
6464
COMPILED_WEBAPP=/home/zp/source/java-stack/codes/javatool/server/target/javatool-server
65-
RESOURCES_PATH=/home/zp/source/union/modules/athena/src/main/resources
65+
RESOURCES_PATH=/home/zp/source/java-stack/codes/javatool/server/src/main/resources
6666
execBootScript

0 commit comments

Comments
 (0)