From fedc6abb788773523a7423320ec7295a5a790fee Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Thu, 27 Jul 2023 14:29:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E6=9B=B4=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 --- hotfix_game.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hotfix_game.sh b/hotfix_game.sh index 6142fda..8b0949a 100644 --- a/hotfix_game.sh +++ b/hotfix_game.sh @@ -46,13 +46,14 @@ git pull cd ${BASE_DIR}/miduo_protocol || exit 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 @@ -85,12 +86,13 @@ if [ ! -d "$my_dir" ]; then fi rm -rf ${BASE_DIR}/hotfix/conf/*.json -yes|cp -r ${BASE_DIR}/miduo_server/conf/c_database_version.json ${BASE_DIR}/hotfix/conf -yes|cp -r ${BASE_DIR}/miduo_server/conf/hotfix.json ${BASE_DIR}/hotfix/conf +cp -rf ${BASE_DIR}/miduo_server/conf/c_database_version.json ${BASE_DIR}/hotfix/conf +cp -rf ${BASE_DIR}/miduo_server/conf/hotfix.json ${BASE_DIR}/hotfix/conf cd ${BASE_DIR} || exit find hotfix/conf/ -type f -name "*.txt" | egrep -v "c_database_version|hotfix"|xargs rm -rf -find hotfix/conf/ -type f -name "*.class" | xargs rm -rf +#find hotfix/conf/ -type f -name "*.class" | xargs rm -rf +find hotfix/conf/ -type f -name "*.class" -delete cat ${BASE_DIR}/miduo_server/conf/c_database_version.json |awk -F':' '/tables/{print $2}'|tr -d '"'|tr '|' '\n'|xargs -i find ${BASE_DIR}/miduo_server/conf/server -name "{}.txt"|xargs -i cp {} ${BASE_DIR}/hotfix/conf/server cat ${BASE_DIR}/miduo_server/conf/hotfix.json |grep name|awk -F'"' '{print $4}'|xargs -i find ${BASE_DIR}/miduo_server/serverlogic/build -name "{}"|xargs -i cp {} ${BASE_DIR}/hotfix/conf/hotswap