更新文件优化
parent
fedc6abb78
commit
37af9e89d3
8
main.sh
8
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)
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
Loading…
Reference in New Issue