12

1031_Game_JinSha.sh

@@ -76,6 +76,8 @@ echo_content() {
 
 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
 }
 
 check_gitaccount() {

1035_ShopYyg_Husomayman.sh

@@ -13,7 +13,6 @@ PlatSvr_Ranch=1035_ShopYyg_Husomayman
 PlatWeb_Ranch=1035_ShopYyg_Husomayman
 PHP_Ranch=1035_ShopYyg_Husomayman
 
-
 # git 平台地址
 Git_PlatAddr=git.wkwork.xyz:LaunchDeploy
 
@@ -23,7 +22,6 @@ Git_PhpAddr=git.wkwork.xyz:php-shop-yyg
 # git 脚本地址
 Git_ScriptAddr=git.wkwork.xyz/LaunchDeploy
 
-
 ###################################################
 
 # 脚本地址前缀
@@ -73,7 +71,7 @@ echo_content() {
 }
 
 check_install_deps() {
-	bash <(curl -sSL $Fun_Script_Url_Path/fun_deps.sh) check_installdeps_php
+	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
 }
 
@@ -113,8 +111,6 @@ run_platsvr_docker() {
 
 }
 
-
-
 # ------------------ 数组定义菜单项 ------------------
 Memu_Items=(
 	"测试 Git 账户"

fun_deps.sh

 #!/bin/bash
 
-
 # 输出函数
 echo_content() {
 	ECHO_TYPE="echo -e"
@@ -35,30 +34,9 @@ echo_content() {
 # docker
 # make
 # unzip
-# nodejs
-# npm
-# pm2
 
 check_install_deps() {
-	for cmd in jq curl make unzip nodejs npm pm2; do
-		if ! command -v "$cmd" &>/dev/null; then
-			echo "❌ 缺少依赖：$cmd"
-			echo "请先安装：sudo apt install $cmd -y"
-			sudo apt install $cmd -y
-			# exit 1
-		fi
-	done
-}
-
-
-# ======= 工具检查(php 环境) =======
-# jq
-# curl
-# make
-# unzip
-
-check_installdeps_php() {
-	for cmd in jq curl make unzip; do
+	for cmd in jq curl make unzip nodejs npm; do
 		if ! command -v "$cmd" &>/dev/null; then
 			echo "❌ 缺少依赖：$cmd"
 			echo "请先安装：sudo apt install $cmd -y"
@@ -68,7 +46,6 @@ check_installdeps_php() {
 	done
 }
 
-
 check_install_nodejs() {
 	echo_content "green" "🔍 正在检测 Node.js 是否已安装..."
 
@@ -150,7 +127,6 @@ check_install_pm2() {
 	echo "🎉 Node.js & PM2 环境准备完成！"
 }
 
-
 # 函数：检查并安装 Docker
 check_install_docker() {