ZacharyZhang-NY/omarchy-pkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix patching to prevent doubling up

Browse Source
This commit is contained in:
Ryan Hughes
2025-12-12 20:06:06 -05:00
parent 5325d8034c
commit 78d09cd2a1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/sync-aur
+7 -6
View File
@@ -44,6 +44,7 @@ fi
SYNCED=0 SYNCED=0
FAILED=0 FAILED=0
SYNCED_PACKAGES=()
# Function to sync a package from AUR # Function to sync a package from AUR
sync_package() { sync_package() {
@@ -65,6 +66,7 @@ sync_package() {
# Remove .git from destination # Remove .git from destination
rm -rf "$PKGBUILDS_DIR/$package/.git" rm -rf "$PKGBUILDS_DIR/$package/.git"
SYNCED_PACKAGES+=("$package")
((SYNCED++)) ((SYNCED++))
else else
print_warning "Failed to clone $package (may not exist in AUR)" print_warning "Failed to clone $package (may not exist in AUR)"
@@ -94,12 +96,11 @@ else
done < <(grep -v "^#" "$PACKAGES_FILE" | grep -v "^$") done < <(grep -v "^#" "$PACKAGES_FILE" | grep -v "^$")
fi fi
# Apply patches for packages that have them # Apply patches only to packages that were actually synced
cd "$PKGBUILDS_DIR" for package in "${SYNCED_PACKAGES[@]}"; do
for dir in */; do if [[ -d "$PKGBUILDS_DIR/$package/patches" ]]; then
if [[ -d "$dir/patches" ]]; then print_info "Applying patches for $package..."
print_info "Applying patches for $dir..." (cd "$PKGBUILDS_DIR/$package" && shopt -s nullglob && for patch in patches/*.patch; do
(cd "$dir" && shopt -s nullglob && for patch in patches/*.patch; do
if ! patch -p1 --no-backup-if-mismatch < "$patch"; then if ! patch -p1 --no-backup-if-mismatch < "$patch"; then
print_error "Failed to apply patch: $patch" print_error "Failed to apply patch: $patch"
exit 1 exit 1