From 61cd9e1994a53119a6b077a02686eae5e55abd39 Mon Sep 17 00:00:00 2001 From: toufic ar Date: Tue, 10 Feb 2026 21:45:19 +0200 Subject: [PATCH] workaround different package names for same PKGBUILD --- build.sh | 21 +++++++++++++-------- pkgbuilds.json | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/build.sh b/build.sh index c4a83b2..d111ea3 100755 --- a/build.sh +++ b/build.sh @@ -25,17 +25,22 @@ jq -c '.[]' pkgbuilds.json | while IFS= read -r src; do "$BUILD_DIR"/taur.db.tar.zst "$rmv" \; done - jq -r '.pkgs[]' <<<"$src" | while IFS= read -r pkg; do - git clone "$base/$pkg" "$SRC_DIR"/"$pkg" && - cd "$SRC_DIR/$pkg" && + jq -c '.pkgs[]' <<<"$src" | while IFS= read -r pkg; do + name=$(jq -r '.name' <<<"$pkg") + git clone "$base/$name" "$SRC_DIR"/"$name" && + cd "$SRC_DIR/$name" && makepkg -cCd --noconfirm --skippgpcheck --sign \ - --key $LONGKEY && + --key $LONGKEY + + jq -r '.nick[]' <<<"$pkg" | while IFS= read -r nick; do repo-add -Rpsvk $LONGKEY \ "$BUILD_DIR"/taur.db.tar.zst \ - "$SRC_DIR"/"$pkg"/*.pkg.tar.zst && - cp -rfv \ - "$SRC_DIR"/"$pkg"/*.pkg.tar.zst "$SRC_DIR"/"$pkg"/*.pkg.tar.zst.sig \ - "$BUILD_DIR" + "$SRC_DIR"/"$name"/"$nick"*.pkg.tar.zst && + cp -rfv \ + "$SRC_DIR"/"$name"/"$nick"*.pkg.tar.zst "$SRC_DIR"/"$name"/"$nick"*.pkg.tar.zst.sig \ + "$BUILD_DIR" + done + done done diff --git a/pkgbuilds.json b/pkgbuilds.json index 9f1308a..79a55f6 100644 --- a/pkgbuilds.json +++ b/pkgbuilds.json @@ -1,7 +1,20 @@ [ { "base": "https://aur.archlinux.org", - "pkgs": ["librewolf-bin", "ungoogled-chromium-bin", "adwaita-qt-git"], + "pkgs": [ + { + "name": "librewolf-bin", + "nick": ["librewolf-bin"] + }, + { + "name": "ungoogled-chromium-bin", + "nick": ["ungoogled-chromium-bin"] + }, + { + "name": "adwaita-qt-git", + "nick": ["adwaita-qt5-git", "adwaita-qt6-git"] + } + ], "rm": [] } ]