From 37af9e89d311bb2805e0c1a5fbfd9322924aa2db Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Thu, 27 Jul 2023 14:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.sh | 8 ++++---- update_game.sh | 35 ++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/main.sh b/main.sh index c54a5ce..7f863e0 100644 --- a/main.sh +++ b/main.sh @@ -117,7 +117,7 @@ game(){ show_file script/txt read -p "请输入文件名称(不需要带文件后缀): " channel echo -e "开始发送 包名:$package, channel:$channel" - send_package_update $package ${channel}.txt 0 + send_package_reboot $package ${channel}.txt 0 game ;; 4) @@ -128,7 +128,7 @@ game(){ show_file script/txt read -p "请输入文件名称(不需要带文件后缀): " channel echo -e "开始发送 包名:$package, channel:$channel" - send_package_update $package ${channel}.txt 1 + send_package_reboot $package ${channel}.txt 1 game ;; 5) @@ -138,7 +138,7 @@ game(){ read -p "请输入包名(不需要带文件后缀): " package read -p "请输入游戏服ip: " ip echo -e "开始发送 包名:$package, ip:$ip" - send_package_update $package $ip 0 + send_package_reboot $package $ip 0 game ;; 6) @@ -148,7 +148,7 @@ game(){ read -p "请输入包名(不需要带文件后缀): " package read -p "请输入游戏服ip: " ip echo -e "开始发送 包名:$package, ip:$ip" - send_package_update $package $ip 1 + send_package_reboot $package $ip 1 game ;; 0) diff --git a/update_game.sh b/update_game.sh index 05d6784..2cabbdf 100644 --- a/update_game.sh +++ b/update_game.sh @@ -25,27 +25,28 @@ if [ ! -d $BASE_DIR ];then exit 7 fi -cd ${BASE_DIR}/miduo_server +cd ${BASE_DIR}/miduo_server || exit echo "当前分支是: `git branch`" git pull -cd ${BASE_DIR}/miduo_protocol +cd ${BASE_DIR}/miduo_protocol || exit echo "当前分支是: `git branch`" git pull #protobuf rm -rf ./protobuf_temp mkdir ./protobuf_temp -find ./protos -name "*.proto" -type f|xargs -i protoc --proto_path=./protos --java_out=./protobuf_temp {} +#find ./protos -name "*.proto" -type f|xargs -i protoc --proto_path=./protos --java_out=./protobuf_temp {} +find ./protos -name "*.proto" -type f -exec protoc --proto_path=./protos --java_out=./protobuf_temp {} + rm -rf ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/global/* rm -rf ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/protocols/* rm -rf ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/world/* -yes|cp -r ./protobuf_temp/rpc/global ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/global -yes|cp -r ./protobuf_temp/rpc/protocols ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/protocols -yes|cp -r ./protobuf_temp/rpc/world ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/world +cp -rf ./protobuf_temp/rpc/global ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/global +cp -rf ./protobuf_temp/rpc/protocols ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/protocols +cp -rf ./protobuf_temp/rpc/world ${BASE_DIR}/miduo_server/gamecommon/src/main/java/rpc/world #gradlew build -cd ${BASE_DIR}/miduo_server +cd ${BASE_DIR}/miduo_server || exit echo "gradlew clean..." ./gradlew clean echo "gradlew build..." @@ -61,14 +62,14 @@ echo "gradlew copyJars..." ./gradlew copyJars #svn update -cd ${BASE_DIR}/fighting +cd ${BASE_DIR}/fighting || exit svn up -cd ${BASE_DIR}/data_excel +cd ${BASE_DIR}/data_excel || exit #echo "当前分支是: `git branch`" #git pull svn up -cd ${BASE_DIR}/execl_to_txt +cd ${BASE_DIR}/execl_to_txt || exit java -Dfile.encoding=UTF-8 -Djava.ext.dirs=./lib ExcelUtils rm -rf ${BASE_DIR}/miduo_server/release @@ -80,16 +81,16 @@ mkdir -p ${BASE_DIR}/miduo_server/release/jieling/lib/matchserverlib mkdir -p ${BASE_DIR}/miduo_server/release/jieling/lib/bloodyBattlelib -yes|cp -r ${BASE_DIR}/miduo_server/luafight/ ${BASE_DIR}/miduo_server/release/jieling/ +cp -rf ${BASE_DIR}/miduo_server/luafight/ ${BASE_DIR}/miduo_server/release/jieling/ mv ${BASE_DIR}/miduo_server/serverlogic/lib/hotfix.jar ${BASE_DIR}/miduo_server/release/jieling/lib/ -yes|cp -r ${BASE_DIR}/miduo_server/serverlogic/lib/*.jar ${BASE_DIR}/miduo_server/release/jieling/lib/serverlogiclib/ -yes|cp -r ${BASE_DIR}/miduo_server/serverlogic/build/libs/*.jar ${BASE_DIR}/miduo_server/release/jieling/lib/ +cp -rf ${BASE_DIR}/miduo_server/serverlogic/lib/*.jar ${BASE_DIR}/miduo_server/release/jieling/lib/serverlogiclib/ +cp -rf ${BASE_DIR}/miduo_server/serverlogic/build/libs/*.jar ${BASE_DIR}/miduo_server/release/jieling/lib/ -yes|cp -r ${BASE_DIR}/miduo_server/conf/* ${BASE_DIR}/miduo_server/release/jieling/conf/ -yes|cp -r ${BASE_DIR}/fighting/Modules/ ${BASE_DIR}/miduo_server/release/jieling/luafight/ -yes|cp -r ${BASE_DIR}/fighting/BattleMain.lua ${BASE_DIR}/miduo_server/release/jieling/luafight/ +cp -rf ${BASE_DIR}/miduo_server/conf/* ${BASE_DIR}/miduo_server/release/jieling/conf/ +cp -rf ${BASE_DIR}/fighting/Modules/ ${BASE_DIR}/miduo_server/release/jieling/luafight/ +cp -rf ${BASE_DIR}/fighting/BattleMain.lua ${BASE_DIR}/miduo_server/release/jieling/luafight/ -cd ${BASE_DIR}/miduo_server/release/jieling/ +cd ${BASE_DIR}/miduo_server/release/jieling/ || exit tar -czvf jieling.tar.gz --exclude=jieling/bin ./* mv jieling.tar.gz /data/update/package/${packages}