1

商城_run.sh

@@ -21,6 +21,7 @@ projects=(
 if [ ! -d "$install_dir" ]; then
     mkdir -p "$install_dir"
 fi
+
 cd $install_dir
 
 
@@ -130,6 +131,7 @@ get_project_names(){
 
 set_branches(){
         repo_dir=$1
+        repo_name=$2
 
         cd "$repo_dir" || exit 1
 
@@ -148,7 +150,7 @@ set_branches(){
 
         branch_count=$(echo "$branches" | wc -l)
         if [ "$branch_count" -gt 1 ]; then
-                echo_content "yellow" "如需更换分支请选择 (如果选择当前分支请按直接回车)："
+                echo_content "yellow" "$repo_name 项目:分支选择 (如不需要更换直接回车)："
                 PS3="请输入分支对应的数字："
                 # 显示分支列表并允许选择
                 select branch in $branches; do
@@ -194,6 +196,8 @@ pull_project() {
 
     repo_url=$1
     repo_dir=$2
+    repo_name=$3
+
     # 检查凭据是否存在
     if [ -f "$CREDENTIALS_FILE" ]; then
         source "$CREDENTIALS_FILE"
@@ -224,11 +228,11 @@ pull_project() {
     if [ $? -ne 0 ]; then
         rm $CREDENTIALS_FILE
         echo_content "red" "克隆仓库失败，请检查仓库地址和凭据"
-        pull_project
+        pull_project $repo_url $repo_dir  $repo_name
     fi
 
 
-    set_branches $repo_dir
+    set_branches $repo_dir  $repo_name
 }
 
 
@@ -360,7 +364,7 @@ init_environment_check(){
         echo_content "green" "拉取项目: production_run"
         echo_content "green" "项目仓库: $production_run_repo"
         echo_content "green" "项目目录: $production_run_dir"
-        pull_project "$production_run_repo" "$production_run_dir"
+        pull_project "$production_run_repo" "$production_run_dir" "production_run"
     else   
         echo_content "green" "更新项目: production_run"
         echo_content "green" "项目仓库: $production_run_repo"
@@ -373,9 +377,7 @@ init_environment_check(){
         echo_content  "green" "拉取项目: production_run"
         echo_content  "green" "项目仓库: $production_server_repo"
         echo_content  "green" "项目目录: $production_server_dir"
-        pull_project  "$production_server_repo" "$production_server_dir"
-        echo_content "green" "选择配置项目分支" 
-        set_branches $production_server_dir
+        pull_project  "$production_server_repo" "$production_server_dir" "服务端配置"
     else   
         echo_content "green" "更新项目: production_run"
         echo_content "green" "项目仓库: $production_server_repo"
@@ -403,7 +405,7 @@ init_environment_check(){
             echo_content "green" "项目目录: $project_dir"
         
             # 调用 pull_project 函数进行项目拉取
-            pull_project "$project_repo" "$project_dir"
+            pull_project "$project_repo" "$project_dir" "$project_name"
         fi
         # rm -rf "$production_run_dir/tomallmcat/"
         # ln -s  "$project_dir/$project_name" "$production_run_dir/$project_name"