diff --git a/bin/sync-aur b/bin/sync-aur index 80549f7..66e9b92 100755 --- a/bin/sync-aur +++ b/bin/sync-aur @@ -135,6 +135,38 @@ for package in "${SYNCED_PACKAGES[@]}"; do fi done +# Apply pkgrel overrides (version-pinned pkgrel bumps that self-clean) +for package in "${SYNCED_PACKAGES[@]}"; do + override_file="$TARGET_DIR/$package/pkgrel.override" + [[ -f "$override_file" ]] || continue + + pkgbuild="$TARGET_DIR/$package/PKGBUILD" + srcinfo="$TARGET_DIR/$package/.SRCINFO" + gitignore="$TARGET_DIR/$package/.gitignore" + current_pkgver=$(grep -m1 '^pkgver=' "$pkgbuild" | cut -d= -f2) + matched=false + + while IFS='=' read -r ver rel; do + [[ "$ver" =~ ^#.*$ || -z "$ver" ]] && continue + if [[ "$current_pkgver" == "$ver" ]]; then + print_info "Applying pkgrel override for $package: pkgver=$ver -> pkgrel=$rel" + sed -i "s/^pkgrel=.*/pkgrel=$rel/" "$pkgbuild" + sed -i "s/pkgrel = .*/pkgrel = $rel/" "$srcinfo" + # Ensure .gitignore tracks the override file (AUR may have overwritten it) + if [[ -f "$gitignore" ]] && ! grep -q '^!pkgrel.override$' "$gitignore"; then + echo '!pkgrel.override' >> "$gitignore" + fi + matched=true + break + fi + done < "$override_file" + + if [[ "$matched" == false ]]; then + print_info "Removing stale pkgrel.override for $package (no match for pkgver=$current_pkgver)" + rm "$override_file" + fi +done + echo "" print_success "Sync complete! (tier: $TIER)" echo " Target: $TARGET_DIR" diff --git a/pkgbuilds/edge/python-terminaltexteffects/.gitignore b/pkgbuilds/edge/python-terminaltexteffects/.gitignore index 0d5180e..42d306d 100644 --- a/pkgbuilds/edge/python-terminaltexteffects/.gitignore +++ b/pkgbuilds/edge/python-terminaltexteffects/.gitignore @@ -4,3 +4,4 @@ !.SRCINFO !.gitignore !.nvchecker.toml +!pkgrel.override diff --git a/pkgbuilds/edge/python-terminaltexteffects/pkgrel.override b/pkgbuilds/edge/python-terminaltexteffects/pkgrel.override new file mode 100644 index 0000000..478053a --- /dev/null +++ b/pkgbuilds/edge/python-terminaltexteffects/pkgrel.override @@ -0,0 +1,3 @@ +# Format: pkgver=pkgrel +# Applied after AUR sync when pkgver matches. Auto-removed when stale. +0.14.2=2 diff --git a/pkgbuilds/edge/yay/patches/pkg-bump.patch b/pkgbuilds/edge/yay/patches/pkg-bump.patch deleted file mode 100644 index 0b8d72b..0000000 --- a/pkgbuilds/edge/yay/patches/pkg-bump.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/.SRCINFO b/.SRCINFO -index a8a0df1..5698489 100644 ---- a/.SRCINFO -+++ b/.SRCINFO -@@ -1,7 +1,7 @@ - pkgbase = yay - pkgdesc = Yet another yogurt. Pacman wrapper and AUR helper written in go. - pkgver = 12.5.7 -- pkgrel = 1 -+ pkgrel = 2 - url = https://github.com/Jguer/yay - arch = i686 - arch = pentium4 -diff --git a/PKGBUILD b/PKGBUILD -index 8262007..a11b031 100644 ---- a/PKGBUILD -+++ b/PKGBUILD -@@ -1,7 +1,7 @@ - # Maintainer: Jguer - pkgname=yay - pkgver=12.5.7 --pkgrel=1 -+pkgrel=2 - pkgdesc="Yet another yogurt. Pacman wrapper and AUR helper written in go." - arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64') - url="https://github.com/Jguer/yay" diff --git a/pkgbuilds/edge/yay/pkgrel.override b/pkgbuilds/edge/yay/pkgrel.override new file mode 100644 index 0000000..e7cbec2 --- /dev/null +++ b/pkgbuilds/edge/yay/pkgrel.override @@ -0,0 +1,3 @@ +# Format: pkgver=pkgrel +# Applied after AUR sync when pkgver matches. Auto-removed when stale. +12.5.7=2