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=()