.

18 files changed, 83 insertions, 105 deletions

diff --git a/.gitignore b/.gitignore
index 4ace2f8..36713eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /aur
+/build
diff --git a/aur.sh b/aur.sh
deleted file mode 100755
index a09a7d0..0000000
--- a/aur.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname -- "$0")
-
-packages="$(find . -mindepth 2 -maxdepth 2 -type f -name PKGBUILD | \
-            xargs -I {} dirname {} | \
-            xargs -I {} basename {})"
-
-mkdir -p aur
-
-for package in $packages; do
-
-    echo -n "$package... "
-
-    if [ -d aur/$package ]; then
-        git -C aur/$package pull -q
-    else
-        git -C aur clone -q ssh://aur@aur.archlinux.org/$package.git
-    fi
-
-    for src in $(find $package -type f -a -not -name .gitignore); do
-        if ! git check-ignore -q $src; then
-            cp $src aur/$src
-        fi
-    done
-
-    (cd aur/$package; makepkg --printsrcinfo > .SRCINFO)
-
-    if git -C aur/$package diff --quiet; then
-        echo "OK"
-    else
-        echo "CHANGED"
-    fi
-
-done
diff --git a/build.sh b/build.sh
index 7b59e91..80bae92 100755
--- a/build.sh
+++ b/build.sh
@@ -2,18 +2,21 @@
 
 set -e
 
-cd $(dirname -- "$0")
+makepkg_opts="-C"
 
-package=$1
+while getopts g flag; do
+    case $flag in
+        g) makepkg_opts="$makepkg_opts -g";;
+        ?) ;;
+    esac
+done
+shift $((OPTIND - 1))
 
-if [ ! -f "./$package/PKGBUILD" ]; then
-    echo "invalid package" 1>&2
-    exit 1
-fi
+. "$(dirname -- "$0")/env.sh"
 
-cd $package
+for package in $packages; do
+    echo ">>" $package
 
-export PATH=/usr/bin:$PATH
-
-makepkg -g
-makepkg -C
+    set_makepkg_envs $package
+    (cd "$root_dir/$package"; makepkg $makepkg_opts)
+done
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index a030fc5..0000000
--- a/clean.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname -- "$0")
-
-packages="$(find . -mindepth 2 -maxdepth 2 -type f -name PKGBUILD | \
-            xargs -I {} dirname {} | \
-            xargs -I {} basename {})"
-
-for package in $packages; do
-    for i in $package/*; do
-        if git check-ignore -q $i; then
-            rm -rf $i
-        fi
-    done
-done
-
diff --git a/env.sh b/env.sh
new file mode 100644
index 0000000..2c30fad
--- /dev/null
+++ b/env.sh
@@ -0,0 +1,30 @@
+root_dir="$(cd "$(dirname -- "$0")"; pwd)"
+build_dir="$root_dir/build"
+aur_dir="$root_dir/aur"
+
+if [ $# -gt 0 ]; then
+    packages="$*"
+else
+    packages="$(find "$root_dir" -mindepth 2 -maxdepth 2 -type f -name PKGBUILD | \
+                xargs -I {} dirname {} | \
+                xargs -I {} basename {})"
+fi
+
+for package in $packages; do
+    if [ ! -f "$root_dir/$package/PKGBUILD" ]; then
+        echo "invalid package $package" 1>&2
+        exit 1
+    fi
+done
+
+export PATH="/usr/bin:$PATH"
+
+
+set_makepkg_envs() {
+    package=$1
+    export PKGDEST="$build_dir/$package"
+    export SRCDEST="$build_dir/$package"
+    export SRCPKGDEST="$build_dir"
+    export LOGDEST="$build_dir"
+    export BUILDDIR="$build_dir"
+}
diff --git a/hat-syslog/.gitignore b/hat-syslog/.gitignore
deleted file mode 100644
index 89b36c5..0000000
--- a/hat-syslog/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/pkg
-/hat-syslog-*.pkg.tar.*
-/src
-/v*.tar.gz
diff --git a/hat-syslog/PKGBUILD b/hat-syslog/PKGBUILD
index 630857c..580cb74 100644
--- a/hat-syslog/PKGBUILD
+++ b/hat-syslog/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bozo Kopic <bozo@kopic.xyz>
 
 pkgname=hat-syslog
-pkgver=0.6.2
+pkgver=0.7.5
 pkgrel=1
 pkgdesc="Syslog server and clients"
 url="https://github.com/hat-open/hat-syslog"
@@ -12,7 +12,7 @@ depends=('python-appdirs' 'python-hat-aio' 'python-hat-json'
 makedepends=('python-hat-doit' 'python-installer' 'yarn'
              'python-sphinxcontrib-plantuml' 'python-sphinxcontrib-programoutput')
 source=("https://github.com/hat-open/hat-syslog/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('5b79be110cc66d1ebd822b65c4c904bfeba172c84c3c858951543c154dcf967f')
+sha256sums=('8d762b2e5fae0b4496024b4afc7386d053684f946aad98207e159e578237ae30')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/opcut/.gitignore b/opcut/.gitignore
deleted file mode 100644
index b204fbc..0000000
--- a/opcut/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/opcut-*.pkg.tar.*
-/pkg
-/src
-/v*.tar.gz
diff --git a/opcut/PKGBUILD b/opcut/PKGBUILD
index 1c6d31b..ff3b07a 100644
--- a/opcut/PKGBUILD
+++ b/opcut/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bozo Kopic <bozo@kopic.xyz>
 
 pkgname=opcut
-pkgver=0.4.8
+pkgver=0.4.9
 pkgrel=1
 pkgdesc="Cutting stock problem optimizer"
 url="https://github.com/bozokopic/opcut"
@@ -10,7 +10,7 @@ arch=('x86_64' 'armv7l' 'aarch64')
 depends=('python-aiohttp' 'python-hat-aio' 'python-hat-json' 'python-cairo')
 makedepends=('python-hat-doit' 'python-installer' 'yarn')
 source=("https://github.com/bozokopic/opcut/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('d26303253186ad653da3dd897e7558de2eed963449180e1b258c08bef7533615')
+sha256sums=('965303a6b69b5cfa5070abb8ae6d4a41e46148b987a3b0f658d997d8c580b20a')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/python-hat-aio/.gitignore b/python-hat-aio/.gitignore
deleted file mode 100644
index d5a4656..0000000
--- a/python-hat-aio/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/pkg
-/python-hat-aio-*.pkg.tar.*
-/src
-/v*.tar.gz
diff --git a/python-hat-aio/PKGBUILD b/python-hat-aio/PKGBUILD
index b8068e0..f0d91f6 100644
--- a/python-hat-aio/PKGBUILD
+++ b/python-hat-aio/PKGBUILD
@@ -2,16 +2,16 @@
 
 _name=hat-aio
 pkgname=python-$_name
-pkgver=0.7.5
+pkgver=0.7.7
 pkgrel=1
 pkgdesc="Hat async utility library"
 url="https://github.com/hat-open/hat-aio"
 license=('Apache')
 arch=('any')
-depends=('python-hat-util')
+depends=('python')
 makedepends=('python-hat-doit' 'python-installer')
 source=("https://github.com/hat-open/hat-aio/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('71f215e9c08ac3a76acd23be05e431ec085715df238f0c59b115735ac94b2f9e')
+sha256sums=('d048a44e51ee2c2d984ab958b3ce2f4105d98b3805c0c1ca277ecca1a23c96b9')
 
 build() {
     cd "$srcdir/$_name-$pkgver"
diff --git a/python-hat-doit/.gitignore b/python-hat-doit/.gitignore
deleted file mode 100644
index 80cf7cc..0000000
--- a/python-hat-doit/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/pkg
-/python-hat-doit-*.pkg.tar.*
-/src
-/v*.tar.gz
diff --git a/python-hat-json/.gitignore b/python-hat-json/.gitignore
deleted file mode 100644
index fac5995..0000000
--- a/python-hat-json/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/pkg
-/python-hat-json-*.pkg.tar.*
-/src
-/v*.tar.gz
diff --git a/python-hat-json/PKGBUILD b/python-hat-json/PKGBUILD
index 2584d41..25366da 100644
--- a/python-hat-json/PKGBUILD
+++ b/python-hat-json/PKGBUILD
@@ -2,7 +2,7 @@
 
 _name=hat-json
 pkgname=python-$_name
-pkgver=0.5.16
+pkgver=0.5.17
 pkgrel=1
 pkgdesc="Hat JSON library"
 url="https://github.com/hat-open/hat-json"
@@ -12,7 +12,7 @@ depends=('python-hat-util' 'python-jsonpatch' 'python-jsonschema'
          'python-yaml' 'python-tomli' 'python-tomli-w')
 makedepends=('python-hat-doit' 'python-installer')
 source=("https://github.com/hat-open/hat-json/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('d7a29503e61e51efd2085280b83c3cfa2893822311fd00cbbdd03b5646795842')
+sha256sums=('a60dcbab21c7b42770a7ca9a9c6c6ba839a52556dc2480e9b85bd2b9a5a1128b')
 
 build() {
     cd "$srcdir/$_name-$pkgver"
diff --git a/python-hat-juggler/.gitignore b/python-hat-juggler/.gitignore
deleted file mode 100644
index 8cdb4fc..0000000
--- a/python-hat-juggler/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/pkg
-/python-hat-juggler-*.pkg.tar.*
-/src
-/v*.tar.gz
diff --git a/python-hat-util/.gitignore b/python-hat-util/.gitignore
deleted file mode 100644
index f081a0e..0000000
--- a/python-hat-util/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/pkg
-/python-hat-util-*.pkg.tar.*
-/src
-/v*.tar.gz
diff --git a/python-hat-util/PKGBUILD b/python-hat-util/PKGBUILD
index 955db76..1843a95 100644
--- a/python-hat-util/PKGBUILD
+++ b/python-hat-util/PKGBUILD
@@ -2,7 +2,7 @@
 
 _name=hat-util
 pkgname=python-$_name
-pkgver=0.6.8
+pkgver=0.6.9
 pkgrel=1
 pkgdesc="Hat utility library"
 url="https://github.com/hat-open/hat-util"
@@ -11,7 +11,7 @@ arch=('any')
 depends=('python')
 makedepends=('python-hat-doit' 'python-installer')
 source=("https://github.com/hat-open/hat-util/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('7dd6717cfb0e817abd02954cf2249bdeec2dc3d45e20047155a3d38ffd66ba43')
+sha256sums=('ee19f44ace8b321f36ec36321725975584c636cfb9439973e6c610183ded4142')
 
 build() {
     cd "$srcdir/$_name-$pkgver"
diff --git a/sync.sh b/sync.sh
new file mode 100755
index 0000000..85827de
--- /dev/null
+++ b/sync.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+. "$(dirname -- "$0")/env.sh"
+
+mkdir -p "$aur_dir"
+
+for package in $packages; do
+    echo ">>" $package
+
+    if [ -d "$aur_dir/$package" ]; then
+        git -C "$aur_dir/$package" pull -q
+    else
+        git -C aur clone -q ssh://aur@aur.archlinux.org/$package.git
+    fi
+
+    cp -p -r -t "$aur_dir/$package" "$root_dir/$package/"*
+
+    (cd "$aur_dir/$package"; makepkg --printsrcinfo > .SRCINFO)
+
+    if git -C "$aur_dir/$package" diff --quiet; then
+        echo "OK"
+    else
+        echo "CHANGED"
+    fi
+done