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

1. 版本排序彻底修复

Browse Source 
按  大版本.中版本.小版本.迭代号  分段数字排序，优先抓取  appbase-v15.20.12  而不是旧版
​
2. 检出命令修正
统一使用  git checkout 提交哈希 -- 目录  语法，不再报路径不存在
This commit is contained in:
ZhanGSKen
2026-05-17 15:34:14 +08:00
parent 79f7f682b3
commit 28bc3a86e3
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,18 @@
#!/system/bin/sh #!/system/bin/sh
## 流程：获取远程最新Tag → 获取Tag对应Commit → 按Commit合并远程模块目录到本地 ## 流程：获取远程最新Tag → 获取Tag对应Commit → 按Commit合并远程模块目录到本地
# ====================== 1. 获取模块远程最新版本TAG ====================== # ====================== 1. 获取模块远程最新版本TAG（修复版本排序） ======================
get_module_latest_tag() { get_module_latest_tag() {
local module_name="$1" local module_name="$1"
git fetch origin --tags 2>/dev/null git fetch origin --tags 2>/dev/null
# 取出所有同前缀标签，去除头部，纯版本排序，取最大最新
git ls-remote --tags origin "${module_name}-*" 2>/dev/null \ git ls-remote --tags origin "${module_name}-*" 2>/dev/null \
| grep -v '\^{}' \ | grep -v '\^{}' \
| sort -V \
| tail -1 \
| awk '{print $2}' \ | awk '{print $2}' \
| sed 's/refs\/tags\///' | sed "s/refs\/tags\/${module_name}-//" \
| sort -t '.' -k1,1n -k2,2n -k3,3n -k4,4n \
| tail -1 \
| xargs echo "${module_name}-"
} }
# ====================== 2. 通过TAG获取对应提交Commit哈希 ====================== # ====================== 2. 通过TAG获取对应提交Commit哈希 ======================
@@ -146,9 +148,9 @@ for item in "${MERGE_APP_PROJECT_LIST[@]}"; do
echo "对应提交点：$TARGET_COMMIT" echo "对应提交点：$TARGET_COMMIT"
echo "----------------------------------------" echo "----------------------------------------"
# 正确写法：用commit检出指定目录 # 正确语法：从指定提交点拉取文件夹覆盖本地
git checkout ${TARGET_COMMIT} -- ${item_lower} git checkout "${TARGET_COMMIT}" -- "${item_lower}"
git add ${item_lower} git add "${item_lower}"
git commit -m "合并模块${item} 来源最新标签:${LATEST_TAG} 提交点:${TARGET_COMMIT}" git commit -m "合并模块${item} 来源最新标签:${LATEST_TAG} 提交点:${TARGET_COMMIT}"
done done
@@ -173,9 +175,8 @@ for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
echo "对应提交点：$TARGET_COMMIT" echo "对应提交点：$TARGET_COMMIT"
echo "----------------------------------------" echo "----------------------------------------"
# 同时检出主目录 + lib目录 git checkout "${TARGET_COMMIT}" -- "${item_lower}" "lib${item_lower}"
git checkout ${TARGET_COMMIT} -- ${item_lower} lib${item_lower} git add "${item_lower}" "lib${item_lower}"
git add ${item_lower} lib${item_lower}
git commit -m "合并模块${item} 来源最新标签:${LATEST_TAG} 提交点:${TARGET_COMMIT}" git commit -m "合并模块${item} 来源最新标签:${LATEST_TAG} 提交点:${TARGET_COMMIT}"
done done