redo hooks infrastructure (yay git 2.9 core.hooksPath)

55 files changed, 32 insertions, 92 deletions

diff --git a/.gitconfig b/.config/git/config
index 7e5bdc6..2144347 100644
--- a/.gitconfig
+++ b/.config/git/config
@@ -1,3 +1,5 @@
 [user]
 	name = Parabola git
 	email = git@parabola.nu
+[core]
+	hooksPath = /srv/git/.config/git/hooks
diff --git a/.config/git/hooks/post-receive b/.config/git/hooks/post-receive
new file mode 120000
index 0000000..081071a
--- /dev/null
+++ b/.config/git/hooks/post-receive
@@ -0,0 +1 @@
+run-parts.sh
\ No newline at end of file
diff --git a/git-hooks/post-receive.agefile b/.config/git/hooks/post-receive.d/agefile
index 91d98ec..10fc253 100755
--- a/git-hooks/post-receive.agefile
+++ b/.config/git/hooks/post-receive.d/agefile
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -x
 agefile="$(git rev-parse --git-dir)"/info/web/last-modified
 
 mkdir -p "$(dirname "$agefile")" &&
diff --git a/.config/git/hooks/post-update b/.config/git/hooks/post-update
new file mode 120000
index 0000000..081071a
--- /dev/null
+++ b/.config/git/hooks/post-update
@@ -0,0 +1 @@
+run-parts.sh
\ No newline at end of file
diff --git a/.config/git/hooks/pre-receive b/.config/git/hooks/pre-receive
new file mode 120000
index 0000000..081071a
--- /dev/null
+++ b/.config/git/hooks/pre-receive
@@ -0,0 +1 @@
+run-parts.sh
\ No newline at end of file
diff --git a/.config/git/hooks/run-parts.sh b/.config/git/hooks/run-parts.sh
new file mode 100755
index 0000000..c42173a
--- /dev/null
+++ b/.config/git/hooks/run-parts.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [[ -d "$0.d" ]]; then
+	run-parts "${@/#/--arg=}" -- "$0.d"
+fi
+file="$GIT_DIR/hooks/${0##*/}"
+if [[ -x "$file" && -f "$file" ]]; then
+	"$file"
+fi
diff --git a/.config/git/hooks/update b/.config/git/hooks/update
new file mode 120000
index 0000000..081071a
--- /dev/null
+++ b/.config/git/hooks/update
@@ -0,0 +1 @@
+run-parts.sh
\ No newline at end of file
diff --git a/.gitignore b/.config/git/ignore
index a640121..006a323 100644
--- a/.gitignore
+++ b/.config/git/ignore
@@ -1,7 +1,6 @@
 # Things in /srv/git directly to ignore
 /.??*
-!/.gitignore
-!/.gitconfig
+!/.config/
 
 # General files to ignore
 *~
diff --git a/abslibre/abslibre.git/hooks/post-receive b/abslibre/abslibre.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/abslibre/abslibre.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/abslibre/blacklist.git/hooks/post-receive b/abslibre/blacklist.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/abslibre/blacklist.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/autobuilder.git/hooks/post-receive b/autobuilder.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/autobuilder.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/dbscripts.git/hooks/post-receive b/dbscripts.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/dbscripts.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/git-meta.git/hooks/post-receive b/git-meta.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/git-meta.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/hackers.git/hooks/post-receive b/hackers.git/hooks/post-receive
index 76938f1..a89f092 100755
--- a/hackers.git/hooks/post-receive
+++ b/hackers.git/hooks/post-receive
@@ -1,11 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -e
 
-for file in ~/git-hooks/post-receive.*; do
-    "$file" "$@"
-done
+# Update the system checkout of hackers.git
+(
+	unset GIT_DIR
+	cd /var/lib/hackers-git
+	git pull
+)
 
-unset GIT_DIR
+# tell nshd
+sudo systemctl reload nshd.service
 
-cd /var/cache/parabola-hackers &&
-git pull
-make postfix-virtual-map
+# TODO: tell postfix
+#/usr/lib/parabola-hackers/postfix-show-virtual-map > /etc/postfix/virtual-parabola.nu
+#postmap hash:/etc/postfix/virtual-parabola.nu
+
+# TODO: tell autobuilder
diff --git a/mkinitcpio-paralogo.git/hooks/post-receive b/mkinitcpio-paralogo.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/mkinitcpio-paralogo.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/multimedia/artwork.git/hooks/post-receive b/multimedia/artwork.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/multimedia/artwork.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/packages/devtools-par.git/hooks/post-receive b/packages/devtools-par.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/packages/devtools-par.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/packages/jh.git/hooks/post-receive b/packages/jh.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/packages/jh.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/packages/libretools.git/hooks/post-receive b/packages/libretools.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/packages/libretools.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/packages/parabola-gnome.git/hooks/post-receive b/packages/parabola-gnome.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/packages/parabola-gnome.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/packages/parabolaiso.git/hooks/post-receive b/packages/parabolaiso.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/packages/parabolaiso.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/packages/parabolaweb-utils.git/hooks/post-receive b/packages/parabolaweb-utils.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/packages/parabolaweb-utils.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/packages/pbs-tools.git/hooks/post-receive b/packages/pbs-tools.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/packages/pbs-tools.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/pacman2pacman.git/hooks/post-receive b/pacman2pacman.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/pacman2pacman.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/paraboladocs.git/hooks/post-receive b/paraboladocs.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/paraboladocs.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/parabolaweb.git/hooks/post-receive b/parabolaweb.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/parabolaweb.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/parabolawiki.git/hooks/post-receive b/parabolawiki.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/parabolawiki.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/paraboley.git/hooks/post-receive b/paraboley.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/paraboley.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/parmanscripts.git/hooks/post-receive b/parmanscripts.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/parmanscripts.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/pbot.git/hooks/post-receive b/pbot.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/pbot.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/repoindex.git/hooks/post-receive b/repoindex.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/repoindex.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/tidy-hooks b/tidy-hooks
deleted file mode 100755
index 4b195f5..0000000
--- a/tidy-hooks
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-
-cd
-
-IFS=''
-find . -not -path '*/.*' -path '*.git' -type d |
-while read -r git_dir; do
-	mkdir -p -- "${git_dir}/hooks"
-	find "${git_dir}/hooks" \( -name '*.sample' -o -type l \) -delete
-	if ! [[ -f "${git_dir}/hooks/post-receive" ]]; then
-		ln -srv git-hooks/post-receive.agefile "${git_dir}/hooks/post-receive"
-	fi
-done
diff --git a/update-agefiles b/update-agefiles
deleted file mode 100755
index 7b3708f..0000000
--- a/update-agefiles
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-cd
-
-IFS=''
-find . -not -path '*/.*' -path '*.git' -type d |
-while read -r git_dir; do
-	pushd "$git_dir"
-	~/git-hooks/post-receive.agefile
-	popd >/dev/null
-done
diff --git a/update-gitmeta b/update-gitmeta
deleted file mode 100755
index f5460bb..0000000
--- a/update-gitmeta
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-message="$1"
-
-cd
-export GIT_DIR="$PWD/.gitmeta"
-if [[ -n $(git status -s .) ]]; then
-	git add .
-	git commit -m "$message"
-fi
-git pull
-git push origin master
diff --git a/~lukeshu/hackers-nslcd.git/hooks/post-receive b/~lukeshu/hackers-nslcd.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~lukeshu/hackers-nslcd.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~lukeshu/maven-dist.git/hooks/post-receive b/~lukeshu/maven-dist.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~lukeshu/maven-dist.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~lukeshu/moz-normalize.git/hooks/post-receive b/~lukeshu/moz-normalize.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~lukeshu/moz-normalize.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~lukeshu/wiki-spam-tools.git/hooks/post-receive b/~lukeshu/wiki-spam-tools.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~lukeshu/wiki-spam-tools.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/abslibre-mips64el.git/hooks/post-receive b/~obsoletes/abslibre-mips64el.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/abslibre-mips64el.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/abslibre-pre-mips64el.git/hooks/post-receive b/~obsoletes/abslibre-pre-mips64el.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/abslibre-pre-mips64el.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/aif.git/hooks/post-receive b/~obsoletes/aif.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/aif.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/arch2parabola.git/hooks/post-receive b/~obsoletes/arch2parabola.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/~obsoletes/arch2parabola.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/archiso.git/hooks/post-receive b/~obsoletes/archiso.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/archiso.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/chroottools.git/hooks/post-receive b/~obsoletes/chroottools.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/chroottools.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/cross-mips64el-unknown-linux-gnu.git/hooks/post-receive b/~obsoletes/cross-mips64el-unknown-linux-gnu.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/cross-mips64el-unknown-linux-gnu.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/gitosis-admin.git/hooks/post-receive b/~obsoletes/gitosis-admin.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/gitosis-admin.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/initscripts.git/hooks/post-receive b/~obsoletes/initscripts.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/initscripts.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/issuetracker.git/hooks/post-receive b/~obsoletes/issuetracker.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/issuetracker.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/libui-sh.git/hooks/post-receive b/~obsoletes/libui-sh.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/libui-sh.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/linux-libre-2.6-LIBRE.git/hooks/post-receive b/~obsoletes/linux-libre-2.6-LIBRE.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/linux-libre-2.6-LIBRE.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/parabola-archiso.git/hooks/post-receive b/~obsoletes/parabola-archiso.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/parabola-archiso.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/parabolaiso.git/hooks/post-receive b/~obsoletes/parabolaiso.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/parabolaiso.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/parabolasocial.git/hooks/post-receive b/~obsoletes/parabolasocial.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/~obsoletes/parabolasocial.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/pbot.git/hooks/post-receive b/~obsoletes/pbot.git/hooks/post-receive
deleted file mode 120000
index 9cbd669..0000000
--- a/~obsoletes/pbot.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../../git-hooks/post-receive.agefile
\ No newline at end of file
diff --git a/~obsoletes/radio.git/hooks/post-receive b/~obsoletes/radio.git/hooks/post-receive
deleted file mode 120000
index ce0ab29..0000000
--- a/~obsoletes/radio.git/hooks/post-receive
+++ /dev/null
@@ -1 +0,0 @@
-../../git-hooks/post-receive.agefile
\ No newline at end of file