修复git管理脚本

This commit is contained in:
2026-07-01 04:42:45 +08:00
parent ca33dab4da
commit 773cc9f6c1

View File

@@ -38,7 +38,7 @@ if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then
exit 1 exit 1
fi fi
# 目录结构校验 # 目录结构校验白名单(不含 . ..
MERGE_OBJECTS_LIST=( MERGE_OBJECTS_LIST=(
.git .git
.gitignore .gitignore
@@ -76,9 +76,12 @@ winboll.properties-demo
) )
REAL_ITEMS=() REAL_ITEMS=()
# 标准排序ls输出循环强制过滤 . 和 ..
while IFS= read -r line; do while IFS= read -r line; do
[[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line") # 跳过虚拟目录 . 和 ..
# 替换为固定ASCII排序、单列无颜色输出解决排序错乱问题 if [[ "$line" != "." && "$line" != ".." ]]; then
REAL_ITEMS+=("$line")
fi
done < <(LC_COLLATE=C ls -a1 --color=none) done < <(LC_COLLATE=C ls -a1 --color=none)
check_diff(){ check_diff(){
@@ -90,7 +93,17 @@ check_diff(){
[[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i") [[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i")
done done
if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then
echo "========================================"
echo "本地目录结构不一致,终止运行" echo "本地目录结构不一致,终止运行"
if [[ ${#miss[@]} -gt 0 ]]; then
echo -e "\n缺失条目"
for m in "${miss[@]}"; do echo " $m"; done
fi
if [[ ${#extra[@]} -gt 0 ]]; then
echo -e "\n多余条目"
for e in "${extra[@]}"; do echo " $e"; done
fi
echo "========================================"
exit 1 exit 1
fi fi
} }