123

1031_Game_Xinpj.sh

@@ -26,25 +26,25 @@ 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=./@$GamePlatName/platsvr
+PlatSvr_Base_Dir=./$GamePlatName/platsvr
 PlatSvr_Branches=(
 	$PlatSvr_Ranch
 )
 
 PlatWeb_Repo_Url=git@$Git_PlatAddr/wk_gameplat_web.git
-PlatWeb_Base_Dir=./@$GamePlatName/platweb
+PlatWeb_Base_Dir=./$GamePlatName/platweb
 PlatWeb_Branches=(
 	$PlatWeb_Ranch
 )
 
 GameSvr_Repo_Url=git@$Git_PlatAddr/wk_bdgame_svr.git
-GameSvr_Base_Dir=./@$GamePlatName/bdgamesvr
+GameSvr_Base_Dir=./$GamePlatName/bdgamesvr
 GameSvr_Branches=(
 	$GameSvr_Ranch
 )
 
 GameWeb_Repo_Url=git@$Git_PlatAddr/wk_bdgame_web.git
-GameWeb_Base_Dir=./@$GamePlatName/bdgameweb
+GameWeb_Base_Dir=./$GamePlatName/bdgameweb
 GameWeb_Branches=(
 	$GameWeb_Ranch
 )
@@ -110,11 +110,11 @@ run_platsvr_docker() {
 
 	local current_dir=$(pwd)
 
-	cd $PlatSvr_Ranch/$PlatSvr_Base_Dir/docker-base || exit
+	cd $PlatSvr_Base_Dir/docker-base || exit
 	make up
 	cd $current_dir
 
-	cd $PlatSvr_Ranch/$PlatSvr_Base_Dir/docker-proxy || exit
+	cd $PlatSvr_Base_Dir/docker-proxy || exit
 	make up
 	cd $current_dir
 
@@ -124,11 +124,11 @@ run_gamesvr_docker() {
 
 	local current_dir=$(pwd)
 
-	cd $GameSvr_Ranch/$GameSvr_Base_Dir/docker-game || exit
+	cd $GameSvr_Base_Dir/docker-game || exit
 	make up
 	cd $current_dir
 
-	cd $GameSvr_Ranch/$GameSvr_Base_Dir/docker-proxy || exit
+	cd $GameSvr_Base_Dir/docker-proxy || exit
 	make up
 	cd $current_dir
 }
@@ -137,7 +137,7 @@ run_service() {
 
 	local current_dir=$(pwd)
 
-	cd $GameSvr_Ranch/$PlatSvr_Base_Dir/server || exit
+	cd $PlatSvr_Base_Dir/server || exit
 	make export_env
 	make start
 	cd $current_dir

ShopEc_Setup.sh

@@ -492,7 +492,6 @@ init_environment_check() {
 	done
 }
 
-
 # git 路径
 Git_ScriptAddr=git.wkwork.xyz/LaunchDeploy
 
@@ -501,7 +500,6 @@ Git_ScriptAddr=git.wkwork.xyz/LaunchDeploy
 # 脚本地址前缀
 Fun_Script_Url_Path=http://oauth2:QFF_7BNyjHsq_Zvfsfut@$Git_ScriptAddr/install/raw/master
 
-
 check_install_deps() {
 	bash <(curl -sSL $Fun_Script_Url_Path/fun_deps.sh) check_install_deps
 	bash <(curl -sSL $Fun_Script_Url_Path/fun_deps.sh) check_install_docker
@@ -518,8 +516,7 @@ main() {
 	# check_git
 	# check_unzip
 	# install_docker
-	check_install_deps()
-	init_environment_check
+	check_install_deps() init_environment_check
 	select_operation
 }