Studio/WinBoLL
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复git管理脚本

Browse Source
This commit is contained in:
ZhangShaojian
2026-07-01 04:33:36 +08:00
parent eee8809485
commit ca33dab4da
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.winboll/bashMergeProjects-to-Projects_Keeper.sh
View File

@@ -72,6 +72,7 @@ libaes
libappbase libappbase
libdebugtemp libdebugtemp
libgpsrelaysentinel libgpsrelaysentinel
libwinboll
local.properties-demo local.properties-demo
mymessagemanager mymessagemanager
positions positions
@@ -81,13 +82,14 @@ winboll
winboll.properties-demo winboll.properties-demo
) )
# ====================== 5. 获取当前目录真实文件列表 ====================== # ====================== 5. 获取当前目录真实文件列表（已替换标准排序ls命令） ======================
REAL_ITEMS=() REAL_ITEMS=()
while IFS= read -r line; do while IFS= read -r line; do
if [[ "$line" != "." && "$line" != ".." ]]; then if [[ "$line" != "." && "$line" != ".." ]]; then
REAL_ITEMS+=("$line") REAL_ITEMS+=("$line")
fi fi
done < <(ls -a) # 替换为固定ASCII排序、单列、无色彩输出，匹配白名单顺序
done < <(LC_COLLATE=C ls -a1 --color=none)
# ====================== 6. 差异比对函数 ====================== # ====================== 6. 差异比对函数 ======================
check_diff() { check_diff() {

3
.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
View File

@@ -78,7 +78,8 @@ winboll.properties-demo
REAL_ITEMS=() REAL_ITEMS=()
while IFS= read -r line; do while IFS= read -r line; do
[[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line") [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
done < <(ls -a) # 替换为固定ASCII排序、单列无颜色输出，解决排序错乱问题
done < <(LC_COLLATE=C ls -a1 --color=none)
check_diff(){ check_diff(){
local miss=() extra=() local miss=() extra=()