1

商城_run.sh

@@ -208,6 +208,7 @@ set_branches(){
 
 updata_project(){
    repo_dir=$1
+   repo_name=$2
 
    cd "$repo_dir" || exit 1
    # 更新代码，如果有冲突时使用本地版本
@@ -218,7 +219,7 @@ updata_project(){
    else   
         echo_content "green" "代码更新完成。"   
    fi
-
+   set_branches $repo_dir  $repo_name
   
 }
 
@@ -326,6 +327,7 @@ select_project() {
     if [ ${#project_names[@]} -eq 1 ]; then
         selected_project="${project_names[0]}"
         project_dir=$(get_project_info "${projects[0]}" 2)
+        project_name=$(get_project_info "${projects[0]}" 0)
     else
         echo_content "yellow" "\n\n"
         echo_content "yellow" "请选择要更新的的项目\n"
@@ -338,6 +340,7 @@ select_project() {
                 for project in "${projects[@]}"; do
                     if [ "$(get_project_info "$project" 0)" = "$selected_project" ]; then
                         project_dir=$(get_project_info "$project" 2)
+                        project_name=$(get_project_info "$project" 0)
                         break 2
                     fi
                 done
@@ -348,7 +351,7 @@ select_project() {
             fi
         done
     fi
-    updata_project "$project_dir"
+    updata_project "$project_dir" "$project_name"
 
 }
 
@@ -404,7 +407,7 @@ init_environment_check(){
         echo_content "green" "更新项目: production_run"
         echo_content "green" "项目仓库: $production_run_repo"
         echo_content "green" "项目目录: $production_run_dir"
-        updata_project  "$production_run_dir" 
+        updata_project  "$production_run_dir"  "production_run"
     fi
 
     if [ ! -d "$production_server_config_dir/.git" ]; then
@@ -417,7 +420,7 @@ init_environment_check(){
         echo_content "green" "更新项目: production_server"
         echo_content "green" "项目仓库: $production_server_config_repo"
         echo_content "green" "项目目录: $production_server_config_dir"
-        updata_project  "$production_server_config_dir" 
+        updata_project  "$production_server_config_dir"  "production_server"
     fi
 
 
@@ -433,7 +436,7 @@ init_environment_check(){
     #     echo_content "green" "更新项目: production_mysql"
     #     echo_content "green" "项目仓库: $production_mysql_repo"
     #     echo_content "green" "项目目录: $production_mysql_dir"
-    #     updata_project  "$production_mysql_dir" 
+    #     updata_project  "$production_mysql_dir"  "production_mysql"
     fi