From e5adb2bf05bd40fabf2659a1246a5d6333a3fdad Mon Sep 17 00:00:00 2001 From: Sebastian Tobie Date: Thu, 17 Jul 2025 15:19:11 +0200 Subject: [PATCH] improved scripts --- add_aur.sh | 1 + build_pkg.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/add_aur.sh b/add_aur.sh index e63c8b1..aae8ed3 100755 --- a/add_aur.sh +++ b/add_aur.sh @@ -5,3 +5,4 @@ if [ -d "packages/${pkg}" ] ; then exit 1 fi git submodule add "https://aur.archlinux.org/${pkg}.git" "packages/${pkg}" +./build_pkg.sh "$pkg" diff --git a/build_pkg.sh b/build_pkg.sh index 9b2da0a..822d9d3 100755 --- a/build_pkg.sh +++ b/build_pkg.sh @@ -1,4 +1,5 @@ #!/bin/zsh +set -e pkg="$1" container=$(echo -n "makepkg-${pkg}" | sed 's;c++;cxx;g') if [ -z "${pkg}" ] ; then @@ -6,7 +7,8 @@ if [ -z "${pkg}" ] ; then exit 1 fi echo "Starte container ${container}" -podman run --detach --quiet --rm -v /etc/pacman.d/mirrorlist:/etc/pacman.d/mirrorlist -v $PWD:/src -v pkg_cache:/var/cache/pacman/pkg -w "/src/packages/$pkg" --userns keep-id --name "${container}" docker.io/archlinux:base-devel /src/wait.sh >/dev/null || exit 1 +rm -f "packages/${pkg}/"*.pkg.tar.* || true +podman run --detach --quiet --rm -v /etc/pacman.d/mirrorlist:/etc/pacman.d/mirrorlist -v $PWD:/src -v pkg_cache:/var/cache/pacman/pkg -w "/src/packages/$pkg" --userns keep-id --name "${container}" docker.io/archlinux:base-devel /src/wait.sh >/dev/null cleanup() { podman stop "${container}" >/dev/null } @@ -14,5 +16,5 @@ cleanup() { trap cleanup INT TERM ZERR EXIT podman exec -ti -w "/src/packages/$pkg" -u 0 "${container}" /src/install_deps.sh -podman exec -t -w "/src/packages/$pkg" "${container}" makepkg -C --skippgpcheck +podman exec -t -w "/src/packages/$pkg" "${container}" makepkg -C --skippgpcheck --nocheck forgejo-uploader packete arch aur "packages/${pkg}/"*.pkg.tar.*