123

1031_Game_Xinpj.sh

@@ -110,11 +110,11 @@ run_platsvr_docker() {
 
 	local current_dir=$(pwd)
 
-	cd $PlatSvr_Base_Dir/$PlatSvr_Ranch/docker-base || exit
+	cd $PlatSvr_Ranch/$PlatSvr_Base_Dir/docker-base || exit
 	make up
 	cd $current_dir
 
-	cd $PlatSvr_Base_Dir/$PlatSvr_Ranch/docker-proxy || exit
+	cd $PlatSvr_Ranch/$PlatSvr_Base_Dir/docker-proxy || exit
 	make up
 	cd $current_dir
 
@@ -124,11 +124,11 @@ run_gamesvr_docker() {
 
 	local current_dir=$(pwd)
 
-	cd $GameSvr_Base_Dir/$GameSvr_Ranch/docker-game || exit
+	cd $GameSvr_Ranch/$GameSvr_Base_Dir/docker-game || exit
 	make up
 	cd $current_dir
 
-	cd $GameSvr_Base_Dir/$GameSvr_Ranch/docker-proxy || exit
+	cd $GameSvr_Ranch/$GameSvr_Base_Dir/docker-proxy || exit
 	make up
 	cd $current_dir
 }
@@ -137,7 +137,7 @@ run_service() {
 
 	local current_dir=$(pwd)
 
-	cd $PlatSvr_Base_Dir/$GameSvr_Ranch/server || exit
+	cd $GameSvr_Ranch/$PlatSvr_Base_Dir/server || exit
 	make export_env
 	make start
 	cd $current_dir

ShopEc_Setup.sh

 #!/bin/bash
 
-Install_Dir="/home/deploy/wkgameplat"
+Install_Dir="/home/deploy/shopec"
 
 production_run_dir="$install_dir/install_projects"
 production_run_repo="git.wkwork.xyz/root/install_projects.git"
@@ -492,6 +492,22 @@ init_environment_check() {
 	done
 }
 
+
+# git 路径
+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
+	# bash <(curl -sSL $Fun_Script_Url_Path/fun_deps.sh) check_install_pm2
+}
+
 main() {
 	if [ "$(id -u)" -ne 0 ]; then
 		echo_content "red" "请以 root 权限运行此脚本。"
@@ -499,9 +515,10 @@ main() {
 	fi
 	echo_content "green" "安装目录:$install_dir"
 	echo_content "green" "初始化脚本 检查环境..."
-	check_git
-	check_unzip
-	install_docker
+	# check_git
+	# check_unzip
+	# install_docker
+	check_install_deps()
 	init_environment_check
 	select_operation
 }

fun_git.sh

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