diff --git a/pushdocker.sh b/pushdocker.sh index 30dda589f..4b1ae5f91 100755 --- a/pushdocker.sh +++ b/pushdocker.sh @@ -43,9 +43,46 @@ else exit 1; fi -node ./config.js ${env} +echo "|*********************|\n" + +if branch=$(git symbolic-ref --short -q HEAD) +then + echo "git on branch $branch \n" +else + echo "git not on any branch \n" +fi +echo "|*********************|\n" + +echo "and config.json is: \n" +node ./config.js ${env} +cat './game-server/config.json' +echo "\n" +echo "|*********************|\n" + +echo "and server_const is \n" +cat './shared/resource/jsons/server_const.json' | grep DEBUG_PAY +cat './shared/resource/jsons/server_const.json' | grep DEBUG_TIME +cat './shared/resource/jsons/server_const.json' | grep CHECK_WORD +cat './shared/resource/jsons/server_const.json' | grep CAN_PAY +cat './shared/resource/jsons/server_const.json' | grep SKIP_ENCODE +echo "\n" +echo "|*********************|" + +read -r -p "Are You Sure? [Y/n]" input + +case $input in + [yY][eE][sS]|[yY]) + echo "Yes" + rsync -av --include '.babelrc' --include '.eslintrc.js' --exclude-from='exclude-file.txt' --progress --inplace --no-owner --no-group --rsh='ssh -p'${port} . ${destUrl} + ;; + [nN][oO]|[nN]) + echo "No" + ;; + *) + echo "Invalid input" + ;; +esac -rsync -av --include '.babelrc' --include '.eslintrc.js' --exclude-from='exclude-file.txt' --progress --inplace --no-owner --no-group --rsh='ssh -p'${port} . ${destUrl} git checkout ./game-server/config.json git checkout ./gm-server/config/env -git checkout ./web-server/config/env +git checkout ./web-server/config/env \ No newline at end of file