Studio/libappbase
4
0
Fork 0
mirror of http://gitea.winboll.cc/Studio/WinBoLL.git synced 2026-07-01 04:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复git管理脚本

Browse Source
This commit is contained in:
ZhangShaojian
2026-07-01 04:44:47 +08:00
parent 773cc9f6c1
commit 0e60d75ac6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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