feat: 更新shell脚本

commit.sh

@@ -39,8 +39,8 @@ function show_usage() {
     echo "  -a              添加所有更改到暂存区"
     echo "  -c <message>    提交更改到 xiaom 分支"
     echo "  -md             合并 xiaom 到 dev 分支"
-    echo "  -mm             合并 xiaom 到 master 分支"
-    echo "  -pm             合并 master 到 xiaom 分支"
+    echo "  -mm             合并 xiaom 到 main 分支"
+    echo "  -pm             合并 main 到 xiaom 分支"
     echo "  -h              显示此帮助信息"
     echo ""
     echo "示例："
@@ -109,12 +109,12 @@ if [ "$flag_commit" = true ] && [ -n "$commit_message" ]; then
 fi
 
 if [ "$flag_pm" = true ]; then
-    echo "${MAGENTA}正在合并 master 分支代码到个人分支 xiaom...${RESET}"
-    # 合并 master 到 xiaom
-    execute_command "git checkout master" "切换至 master 分支失败"
-    execute_command "git pull" "拉取 master 分支最新内容失败"
+    echo "${MAGENTA}正在合并 main 分支代码到个人分支 xiaom...${RESET}"
+    # 合并 main 到 xiaom
+    execute_command "git checkout main" "切换至 main 分支失败"
+    execute_command "git pull" "拉取 main 分支最新内容失败"
     execute_command "git checkout xiaom" "切换至 xiaom 分支失败"
-    execute_command "git merge master" "合并 master 到 xiaom 分支失败" "false"
+    execute_command "git merge main" "合并 main 到 xiaom 分支失败" "false"
     merge_m2x_status=$?
     if [ $merge_m2x_status -ne 0 ]; then
         # 检查是否有冲突
@@ -165,11 +165,11 @@ if [ "$flag_md" = true ]; then
 fi
 
 if [ "$flag_mm" = true ]; then
-    echo "${MAGENTA}正在合并代码到 master 分支...${RESET}"
-    # 合并 xiaom 到 master
-    execute_command "git checkout master" "切换至 master 分支失败"
-    execute_command "git pull" "拉取 master 分支最新内容失败"
-    execute_command "git merge xiaom" "合并 xiaom 到 master 分支失败" "false"
+    echo "${MAGENTA}正在合并代码到 main 分支...${RESET}"
+    # 合并 xiaom 到 main
+    execute_command "git checkout main" "切换至 main 分支失败"
+    execute_command "git pull" "拉取 main 分支最新内容失败"
+    execute_command "git merge xiaom" "合并 xiaom 到 main 分支失败" "false"
     merge_x2m_status=$?
     if [ $merge_x2m_status -ne 0 ]; then
         # 检查是否有冲突
@@ -188,7 +188,7 @@ if [ "$flag_mm" = true ]; then
             exit ${merge_x2m_status}
         fi
     fi
-    execute_command "git push" "推送 master 分支失败"
+    execute_command "git push" "推送 main 分支失败"
     execute_command "git checkout xiaom" "切换至 xiaom 分支失败"
 fi
 

pull.sh

@@ -58,10 +58,10 @@ for product_code in "${product_code_list[@]}"; do
     fi
     execute_command "git push" "推送 ${product_code}-test 分支失败"
 
-    # 合并 ${product_code}-test 到 master
-    execute_command "git checkout master" "切换至 master 分支失败"
-    execute_command "git pull" "拉取 master 分支最新内容失败"
-    execute_command "git merge ${product_code}-test" "合并 ${product_code}-test 到 master 分支失败" "false"
+    # 合并 ${product_code}-test 到 main
+    execute_command "git checkout main" "切换至 main 分支失败"
+    execute_command "git pull" "拉取 main 分支最新内容失败"
+    execute_command "git merge ${product_code}-test" "合并 ${product_code}-test 到 main 分支失败" "false"
     merge_t2m_status=$?
     if [ $merge_t2m_status -ne 0 ]; then
         # 检查是否有冲突
@@ -80,13 +80,13 @@ for product_code in "${product_code_list[@]}"; do
             exit ${merge_t2m_status}
         fi
     fi
-    execute_command "git push" "推送至 master 分支失败"
+    execute_command "git push" "推送至 main 分支失败"
 done
 
-# # 合并 master 到 ${product_code}-dev
+# # 合并 main 到 ${product_code}-dev
 # execute_command "git checkout ${product_code}-dev" "切换至 ${product_code}-dev 分支失败"
 # execute_command "git pull" "拉取 ${product_code}-dev 分支最新内容失败"
-# execute_command "git merge master" "合并 master 到 ${product_code}-dev 分支失败" "false"
+# execute_command "git merge main" "合并 main 到 ${product_code}-dev 分支失败" "false"
 # merge_m2d_status=$?
 # if [ $merge_m2d_status -ne 0 ]; then
 #     # 检查是否有冲突

push.sh

@@ -51,14 +51,14 @@ env=${env:-test}
 
 echo "${MAGENTA}正在合并代码到 ${product_code}-test 分支...${RESET}"
 
-# 切换并拉取 master 分支
-execute_command "git checkout master" "切换至 master 分支失败"
-execute_command "git pull" "拉取 master 分支最新内容失败"
+# 切换并拉取 main 分支
+execute_command "git checkout main" "切换至 main 分支失败"
+execute_command "git pull" "拉取 main 分支最新内容失败"
 
-# 合并 master 到 ${product_code}-test
+# 合并 main 到 ${product_code}-test
 execute_command "git checkout ${product_code}-test" "切换至 ${product_code}-test 分支失败"
 execute_command "git pull" "拉取 ${product_code}-test 分支最新内容失败"
-execute_command "git merge master" "合并 master 到 ${product_code}-test 分支失败" "false"
+execute_command "git merge main" "合并 main 到 ${product_code}-test 分支失败" "false"
 merge_m2t_status=$?
 if [ $merge_m2t_status -ne 0 ]; then
     # 检查是否有冲突