From ca33dab4da13afd124932a1b806bc6bded9f22ca Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Wed, 1 Jul 2026 04:33:36 +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     | 6 ++++--
 .winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper.sh b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
index 520bd82..18355f2 100644
--- a/.winboll/bashMergeProjects-to-Projects_Keeper.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper.sh
@@ -72,6 +72,7 @@ libaes
 libappbase
 libdebugtemp
 libgpsrelaysentinel
+libwinboll
 local.properties-demo
 mymessagemanager
 positions
@@ -81,13 +82,14 @@ winboll
 winboll.properties-demo
 )
 
-# ====================== 5. 获取当前目录真实文件列表 ======================
+# ====================== 5. 获取当前目录真实文件列表（已替换标准排序ls命令） ======================
 REAL_ITEMS=()
 while IFS= read -r line; do
     if [[ "$line" != "." && "$line" != ".." ]]; then
         REAL_ITEMS+=("$line")
     fi
-done < <(ls -a)
+# 替换为固定ASCII排序、单列、无色彩输出，匹配白名单顺序
+done < <(LC_COLLATE=C ls -a1 --color=none)
 
 # ====================== 6. 差异比对函数 ======================
 check_diff() {
diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
index 3676aae..f43a172 100644
--- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
@@ -78,7 +78,8 @@ winboll.properties-demo
 REAL_ITEMS=()
 while IFS= read -r line; do
     [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
-done < <(ls -a)
+# 替换为固定ASCII排序、单列无颜色输出，解决排序错乱问题
+done < <(LC_COLLATE=C ls -a1 --color=none)
 
 check_diff(){
     local miss=() extra=()