123

1031_Game_JinSha.sh

@@ -6,15 +6,21 @@ GamePlatName=1031_Game_JinSha
 GameSvr_Ranch=1031_Game_JinSha
 GameWeb_Ranch=1031_Game_JinSha
 
-Svr_Repo_Url="git@git.wkwork.xyz:LaunchDeploy/wk_gameplat_svr.git"
-Svr_Base_Dir="./svr"
-Svr_Branches=(
+PlatSvr_Repo_Url="git@git.wkwork.xyz:LaunchDeploy/wk_gameplat_svr.git"
+PlatSvr_Base_Dir="./platsvr"
+PlatSvr_Branches=(
 	$GameSvr_Ranch
 )
 
-Web_Repo_Url="git@git.wkwork.xyz:LaunchDeploy/wk_gameplat_web.git"
-Web_Base_Dir="./web"
-Web_Branches=(
+PlatWeb_Repo_Url="git@git.wkwork.xyz:LaunchDeploy/wk_gameplat_web.git"
+PlatWeb_Base_Dir="./platweb"
+PlatWeb_Branches=(
+	$GameWeb_Ranch
+)
+
+GameWeb_Repo_Url="git@git.wkwork.xyz:LaunchDeploy/wk_game_web.git"
+GameWeb_Base_Dir="./gameweb"
+GameWeb_Branches=(
 	$GameWeb_Ranch
 )
 
@@ -54,12 +60,15 @@ check_gitaccount() {
 }
 
 fetch_git_platsvr() {
-	bash <(curl -sSL $Fun_Script_Url/fun_git.sh) fetch_git_platsvr $Svr_Repo_Url $Svr_Base_Dir $Svr_Branches
+	bash <(curl -sSL $Fun_Script_Url/fun_git.sh) fetch_git $PlatSvr_Repo_Url $PlatSvr_Base_Dir $PlatSvr_Branches
 }
 
 fetch_git_platweb() {
-	bash <(curl -sSL $Fun_Script_Url/fun_git.sh) fetch_git_platweb $Web_Repo_Url $Web_Base_Dir $Web_Branches
+	bash <(curl -sSL $Fun_Script_Url/fun_git.sh) fetch_git $PlatWeb_Repo_Url $PlatWeb_Base_Dir $PlatWeb_Branches
+}
 
+fetch_git_gameweb() {
+	bash <(curl -sSL $Fun_Script_Url/fun_git.sh) fetch_git $GameWeb_Repo_Url $GameWeb_Base_Dir $GameWeb_Branches
 }
 
 linux_docker() {
@@ -68,22 +77,22 @@ linux_docker() {
 
 run_docker() {
 
-	cd ./svr/$GameSvr_Ranch/docker-base || exit
+	cd ./platsvr/$GameSvr_Ranch/docker-base || exit
 	make up
 	cd ../../..
 
-	cd ./svr/$GameSvr_Ranch/docker-game || exit
+	cd ./platsvr/$GameSvr_Ranch/docker-game || exit
 	make up
 	cd ../../..
 
-	cd ./svr/$GameSvr_Ranch/docker-proxy || exit
+	cd ./platsvr/$GameSvr_Ranch/docker-proxy || exit
 	make up
 	cd ../../..
 
 }
 
 run_service() {
-	cd ./svr/$GameSvr_Ranch/server || exit
+	cd ./platsvr/$GameSvr_Ranch/server || exit
 	make export_env
 	make start
 	cd ../../..

fun_git.sh

@@ -142,7 +142,43 @@ clone_branch() {
 	done
 }
 
-fetch_git_platsvr() {
+# fetch_git_platsvr() {
+
+# 	local tmp_svr_repo_url=$1
+# 	local tmp_svr_base_dir=$2
+# 	local tmp_svr_branches=$3
+
+# 	# 主循环
+# 	for branch in "${tmp_svr_branches[@]}"; do
+# 		tmp_target_dir="$tmp_svr_base_dir/$branch"
+
+# 		if [ -d "$tmp_target_dir/.git" ]; then
+# 			update_branch "$tmp_svr_repo_url" "$branch" "$tmp_target_dir"
+# 		else
+# 			clone_branch "$tmp_svr_repo_url" "$branch" "$tmp_target_dir"
+# 		fi
+# 	done
+# }
+
+# fetch_git_platweb() {
+
+# 	local tmp_web_repo_url=$1
+# 	local tmp_web_base_dir=$2
+# 	local tmp_web_branches=$3
+
+# 	# 主循环
+# 	for branch in "${tmp_web_branches[@]}"; do
+# 		tmp_target_dir="$tmp_web_base_dir/$branch"
+
+# 		if [ -d "$tmp_target_dir/.git" ]; then
+# 			update_branch "$tmp_web_repo_url" "$branch" "$tmp_target_dir"
+# 		else
+# 			clone_branch "$tmp_web_repo_url" "$branch" "$tmp_target_dir"
+# 		fi
+# 	done
+# }
+
+fetch_git() {
 
 	local tmp_svr_repo_url=$1
 	local tmp_svr_base_dir=$2
@@ -160,22 +196,4 @@ fetch_git_platsvr() {
 	done
 }
 
-fetch_git_platweb() {
-
-	local tmp_web_repo_url=$1
-	local tmp_web_base_dir=$2
-	local tmp_web_branches=$3
-
-	# 主循环
-	for branch in "${tmp_web_branches[@]}"; do
-		tmp_target_dir="$tmp_web_base_dir/$branch"
-
-		if [ -d "$tmp_target_dir/.git" ]; then
-			update_branch "$tmp_web_repo_url" "$branch" "$tmp_target_dir"
-		else
-			clone_branch "$tmp_web_repo_url" "$branch" "$tmp_target_dir"
-		fi
-	done
-}
-
 "$@"