mirror of
http://gitea.winboll.cc/Studio/WinBoLL.git
synced 2026-07-01 04:45:46 +08:00
修复git管理脚本
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user