diff --git a/hotfix_game.sh b/hotfix_game.sh index d18d366..69e97ad 100644 --- a/hotfix_game.sh +++ b/hotfix_game.sh @@ -49,23 +49,22 @@ check_json(){ check_json ${BASE_DIR}/miduo_server/conf/hotfix.json check_json ${BASE_DIR}/miduo_server/conf/c_database_version.json -cd ${BASE_DIR}/miduo_protocol || exit -git branch -git pull - -#protobuf -cd ${BASE_DIR}/miduo_protocol || exit -rm -rf ./protobuf_temp -mkdir ./protobuf_temp -# shellcheck disable=SC2038 -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/* -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 +#cd ${BASE_DIR}/miduo_protocol || exit +#git branch +#git pull +##protobuf +#cd ${BASE_DIR}/miduo_protocol || exit +#rm -rf ./protobuf_temp +#mkdir ./protobuf_temp +## shellcheck disable=SC2038 +#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/* +#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 @@ -92,9 +91,9 @@ java -Dfile.encoding=UTF-8 -Djava.ext.dirs=./lib ExcelUtils #热更地址 my_dir=${BASE_DIR}/hotfix/conf if [ ! -d "$my_dir" ]; then - echo "创建文件夹" - mkdir -p ${my_dir}/server - mkdir -p ${my_dir}/hotswap + echo "创建文件夹" + mkdir -p ${my_dir}/server + mkdir -p ${my_dir}/hotswap fi rm -rf ${BASE_DIR}/hotfix/conf/*.json @@ -102,7 +101,7 @@ cp -rf ${BASE_DIR}/miduo_server/conf/c_database_version.json ${BASE_DIR}/hotfix/ 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 "*.txt" -delete #find hotfix/conf/ -type f -name "*.class" | xargs rm -rf find hotfix/conf/ -type f -name "*.class" -delete