1 files changed, 41 insertions, 23 deletions
diff --git a/build-all-with-docker b/build-all-with-docker
index 5c9d76adf..f3a9dee7c 100755
--- a/build-all-with-docker
+++ b/build-all-with-docker
@@ -24,32 +24,50 @@ if [ -n "$(git status --porcelain)" ]; then
   exit 1
 fi
 
-ids=()
-
-for pkg in */PKGBUILD; do
-  cd "${pkg%/PKGBUILD}"
-  (
+ids=$(
+  for pkg in */PKGBUILD; do
+    cd "${pkg%/PKGBUILD}"
     ../addPkgbuildPatch add
-    docker run --rm -v .:/build arch-build:latest
-    docker run --rm -v .:/build arch32-i486-build
-    docker run --rm -v .:/build arch32-i686-build
-    docker run --rm -v .:/build arch32-pentium4-build
-    docker run --rm -v .:/build artix-build:latest
+    docker run --rm -d -v .:/build arch-build:latest
+    docker run --rm -d -v .:/build arch32-i486-build
+    docker run --rm -d -v .:/build arch32-i686-build
+    docker run --rm -d -v .:/build arch32-pentium4-build
+    docker run --rm -d -v .:/build artix-build:latest
+    cd ..
+  done \
+  | tee /dev/stderr
+)
+
+check_and_commit_package_updates() {
+  [ -z "$(git status --porcelain)" ] && return
+  for pkg in $(
+    git status --porcelain \
+    | sed '
+      s@^.. @@
+      s@/[^/]\+$@@
+    ' \
+    | grep -vxFf <(
+      docker ps --format '{{.Mounts}}' --no-trunc \
+      | sed 's@^.*/@@'
+    )
+  ); do
+    if ! [ -d "$pkg" ]; then
+      >&2 echo "$pwd is not a directory"
+      continue
+    fi
+    cd "$pkg"
     ../addPkgbuildPatch del
-    [ -n "$(git status --porcelain -- PKGBUILD)" ] && ../commit-package -a && git push
-  ) &
-  ids[${#ids[@]}]=$!
-  cd ..
-done
+    [ -n "$(git status --porcelain -- .)" ] \
+    && ../commit-package -a \
+    && git push
+    cd ..
+  done
+}
 
-while [ "${#ids[@]}" -gt 0 ]; do
+while docker ps --no-trunc | grep -wF "${ids}"; do
   sleep 10
-  ids=(
-    $(
-      ls /proc \
-      | grep -xFf <(printf '%s\n' "${ids[@]}") \
-      | tee /dev/stderr
-    )
-  )
+  check_and_commit_package_updates
   date
 done
+
+check_and_commit_package_updates