added .vscode to ignore

.gitignore

@@ -3,3 +3,5 @@ packages/*/.config
 packages/*/.cache
 packages/*/*.pkg.tar.*
 packages/*/*.tar.gz
+uploads
+.vscode

.gitmodules

@@ -190,3 +190,9 @@
 [submodule "packages/phantomjs"]
 	path = packages/phantomjs
 	url = https://aur.archlinux.org/phantomjs.git
+[submodule "packages/snapd"]
+	path = packages/snapd
+	url = https://aur.archlinux.org/snapd.git
+[submodule "packages/ckan-bin"]
+	path = packages/ckan-bin
+	url = https://aur.archlinux.org/ckan-bin.git

add_aur.sh

@@ -1,4 +1,5 @@
 #!/bin/zsh
+packages=()
 while [ ! -z "$1" ] ; do
     pkg="$1"
     if [ -d "packages/${pkg}" ] ; then
@@ -6,6 +7,7 @@ while [ ! -z "$1" ] ; do
     else
         git submodule add "https://aur.archlinux.org/${pkg}.git" "packages/${pkg}"
     fi
-    ./build_pkg.sh "$pkg"
+    packages+=("$pkg")
     shift
 done
+./build_pkg.sh "$packages[@]"

build_pkg.sh

@@ -1,31 +1,61 @@
 #!/bin/zsh
-set -e
+declare -a CONTAINER
-pkg="$1"
+#CONTAINERS=()
-container=$(echo -n "makepkg-${pkg}" | sed 's;c++;cxx;g')
-if [ -z "${pkg}" ] ; then
-    echo "kein Packet angegeben"
-    exit 1
-fi
 
-if [ ! -d "packages/${pkg}" ] ; then
+new_env(){
-    echo "Packet ${pkg} existiert noch nicht"
+    echo "Starte container ${container}"
-    exit 1
+    podman run --detach --quiet --rm\
-fi
+        -v /etc/pacman.d/mirrorlist:/etc/pacman.d/mirrorlist\
-if [ ! -f "packages/${pkg}/.SRCINFO" ] ; then
+        -v "$PWD:/src"\
-    echo ".SRCINFO fehlt von ${pkg}"
+        -v pkg_cache:/var/cache/pacman/pkg\
-    exit 1
+        -v "$PWD/uploads:/uploads"\
-fi
+        -e PKGDEST="/uploads"\
+        -e BUILDDIR=/tmp/build\
+        -e SRCDEST=/tmp/src\
+        -e XDG_CACHE_HOME=/tmp/cache\
+        -e XDG_CONFIG_HOME=/tmp/config\
+        -e CARGO_HOME=/tmp/cargo\
+        -e GOPATH=/tmp/go\
+        -e HOME=/tmp/home\
+        -w "/src/packages/$pkg"\
+        --userns keep-id --name "${container}"\
+        docker.io/archlinux:base-devel /src/wait.sh >/dev/null
+    CONTAINERS+=("${container}")
+}
+build_pkg(){
+    local pkg
+    pkg=$(basename "$1")
+    local container
+    container=$(echo -n "makepkg-${pkg}" | sed 's;c++;cxx;g')
+    if [ -z "${pkg}" ] ; then
+        echo "kein Packet angegeben"
+        exit 1
+    fi
+
+    if [ ! -d "packages/${pkg}" ] ; then
+        echo "Packet ${pkg} existiert noch nicht"
+        exit 1
+    fi
+    if [ ! -f "packages/${pkg}/.SRCINFO" ] ; then
+        echo ".SRCINFO fehlt von ${pkg}"
+        exit 1
+    fi
+    new_env "$pkg"
+    podman exec -ti -w "/src/packages/$pkg" -u 0 "${container}" /src/install_deps.sh || return 1
+    podman exec -t -w "/src/packages/${pkg}" "${container}" makepkg -C --skippgpcheck --nocheck || return 1
+}
 
-echo "Starte container ${container}"
-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 -i "${container}" >/dev/null
+    echo "Stopping ${CONTAINERS[*]}"
+    podman stop -i "${CONTAINERS[@]}" >/dev/null
 }
 
 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 --nocheck
+while [ -n "$1" ] ; do
+    build_pkg "$1" || echo Failed to build "$1"
+    shift
+done
+
 export $(echo 'url=forgejo://upload' | git-credential-keepassxc get --json | jq -r '"GITHUB_TOKEN="+.password+" GITHUB_SERVER_URL="+.username')
-forgejo-uploader packete arch aur "packages/${pkg}/"*.pkg.tar.*
+forgejo-uploader packete arch aur uploads/*.pkg.tar.*

packages/ckan-bin

@@ -0,0 +1 @@
+Subproject commit 28b5f0290786713b79d54f91d9f5d0bf3f583d63

packages/snapd

@@ -0,0 +1 @@
+Subproject commit 54cf17b6bdb48c62a97ff51113e3d08f0f7de80d

packages/sulis

@@ -1 +1 @@
-Subproject commit d074948047607a45ac92cd20333a34c45b3481ca
+Subproject commit c5380df51e1fdb244639894050a26ae00ea0da05

packages/vscodium-bin

@@ -1 +1 @@
-Subproject commit ae00b7aa94ed8e09c69a8a776f731e6e4d7131be
+Subproject commit 956fa9173a947ffb2052cabeac2706e9ec0654d4

packages/waydroid-helper

@@ -1 +1 @@
-Subproject commit 35a6cc44c06783401692b0663c937c603e40acdc
+Subproject commit f07834502a36cea8255c79d2bd790b38f8038623