12

1031_Game_Xinpj.sh

@@ -25,26 +25,26 @@ Git_ScriptAddr=git.wkwork.xyz/LaunchDeploy
 # 脚本地址前缀
 Fun_Script_Url_Path=http://oauth2:QFF_7BNyjHsq_Zvfsfut@$Git_ScriptAddr/install/raw/master
 
-PlatSvr_Repo_Url="git@$Git_PlatAddr/wk_gameplat_svr.git"
-PlatSvr_Base_Dir="./platsvr"
+PlatSvr_Repo_Url=git@$Git_PlatAddr/wk_gameplat_svr.git
+PlatSvr_Base_Dir=./@$GamePlatName/platsvr
 PlatSvr_Branches=(
 	$PlatSvr_Ranch
 )
 
-PlatWeb_Repo_Url="git@$Git_PlatAddr/wk_gameplat_web.git"
-PlatWeb_Base_Dir="./platweb"
+PlatWeb_Repo_Url=git@$Git_PlatAddr/wk_gameplat_web.git
+PlatWeb_Base_Dir=./@$GamePlatName/platweb
 PlatWeb_Branches=(
 	$PlatWeb_Ranch
 )
 
-GameSvr_Repo_Url="git@$Git_PlatAddr/wk_bdgame_svr.git"
-GameSvr_Base_Dir="./bdgamesvr"
+GameSvr_Repo_Url=git@$Git_PlatAddr/wk_bdgame_svr.git
+GameSvr_Base_Dir=./@$GamePlatName/bdgamesvr
 GameSvr_Branches=(
 	$GameSvr_Ranch
 )
 
-GameWeb_Repo_Url="git@$Git_PlatAddr/wk_bdgame_web.git"
-GameWeb_Base_Dir="./bdgameweb"
+GameWeb_Repo_Url=git@$Git_PlatAddr/wk_bdgame_web.git
+GameWeb_Base_Dir=./@$GamePlatName/bdgameweb
 GameWeb_Branches=(
 	$GameWeb_Ranch
 )

fun_git.sh

@@ -187,7 +187,8 @@ fetch_git() {
 	# 主循环
 	for branch in "${tmp_svr_branches[@]}"; do
 		# tmp_target_dir="$tmp_svr_base_dir/$branch"
-		tmp_target_dir="$branch/$tmp_svr_base_dir"
+		# tmp_target_dir="$branch/$tmp_svr_base_dir"
+		tmp_target_dir=$tmp_svr_base_dir
 
 		if [ -d "$tmp_target_dir/.git" ]; then
 			update_branch "$tmp_svr_repo_url" "$branch" "$tmp_target_dir"