From 0e60d75ac60d75e70dd834baf6afbc811bd6511f Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Wed, 1 Jul 2026 04:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .winboll/bashMergeProjects-to-Projects_Keeper.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper.sh b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
index 18355f2..46190ae 100644
--- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
@@ -82,13 +82,13 @@ winboll
 winboll.properties-demo
 )
 
-# ====================== 5. 获取当前目录真实文件列表（已替换标准排序ls命令） ======================
+# ====================== 5. 获取当前目录真实文件列表（兼容过滤 . ..） ======================
 REAL_ITEMS=()
+# 使用固定排序ls，自动过滤 . 和 ..，不会进入比对数组
 while IFS= read -r line; do
     if [[ "$line" != "." && "$line" != ".." ]]; then
         REAL_ITEMS+=("$line")
     fi
-# 替换为固定ASCII排序、单列、无色彩输出，匹配白名单顺序
 done < <(LC_COLLATE=C ls -a1 --color=none)
 
 # ====================== 6. 差异比对函数 ======================
@@ -167,7 +167,7 @@ echo -e "#@@@ 开始合并应用型模块源码 @@@#
 for item in "${MERGE_APP_PROJECT_LIST[@]}"; do
     echo "正在合并 $item 项目 ..."
     item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
-git checkout origin/$item_lower $item_lower
+    git checkout origin/$item_lower $item_lower
     git add .
     git commit -m "合并 $item 项目"
 done
@@ -183,7 +183,7 @@ echo -e "#@@@ 开始合并类库型模块源码 @@@#
 for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
     echo "正在合并 $item 项目 ..."
     item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
-git checkout origin/$item_lower $item_lower lib$item_lower
+    git checkout origin/$item_lower $item_lower lib$item_lower
     git add .
     git commit -m "合并 $item 项目"
 done