auto init fossil test instances

3 files changed, 20 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index bdcbef9..3a50446 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ unit_files_basenames = $(addprefix $(our_name)@.,service path timer)
 unit_files = $(addprefix src/,$(unit_files_basenames))
 unit_instances = $(subst @,@"$(unit_instance_name)",$(unit_files_basenames))
 unit_instance = $(our_name)@$(unit_instance_name).service
+fossil_test_instances = '$(shell systemd-escape fossil-instance-1)' '$(shell systemd-escape a/b/c/fossil-instance-2)'
 
 default: install start test
 install:
@@ -19,6 +20,8 @@ start stop restart status show: | $(fossil_database)
 follow:
         journalctl --user $(addprefix -u , $(unit_instances)) -f
 test deps:
+        mkdir -p $HOME/src/a/b/c
+        systemctl --user start --wait $(addprefix fossil-init@,$(fossil_test_instances))
         sudo $(MAKE) -$(MAKEFLAGS) $@
 
 
@@ -43,7 +46,7 @@ else
 $(error "you must define THE_USER")
 endif
 unitdir = /etc/systemd/system
-unit_files = $(addprefix src/fossil-user,@.service .socket) src/fossil-test@.service
+unit_files = $(addprefix src/fossil-user,@.service .socket) src/fossil-test@.service src/fossil-init@.service
 units = $(filter-out %@.service,$(notdir $(unit_files)))
 executables = src/endofossil
 bindir = /usr/local/bin
diff --git a/src/fossil-init@.service b/src/fossil-init@.service
new file mode 100644
index 0000000..6e300b0
--- /dev/null
+++ b/src/fossil-init@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description = Create new Fossil repositories on endofossil search path
+ConditionUser = !root
+
+[Service]
+Type = oneshot
+ExecStart = sh -ec '\
+mkdir -p "$HOME"/src; \
+cd "$HOME"/src/"$(dirname "$0")"; \
+fossil=$${0##*/}; \
+[ ! -e "$fossil".fossil ] || exit 0; \
+fossil init ./"$fossil".fossil \
+' "%I"
diff --git a/src/fossil-test@.service b/src/fossil-test@.service
index 56e1a21..1643925 100644
--- a/src/fossil-test@.service
+++ b/src/fossil-test@.service
@@ -24,5 +24,7 @@ ssh-keygen -t ed25519 -f .ssh/id_ed25519 -N ""; \
 ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -- %i@localhost :; \
 ssh -o BatchMode=yes -o StrictHostKeyChecking=yes        -- %i@localhost uptime; \
 cd .ssh; \
-fossil clone ssh://%i@localhost/src/fossil/db db~$(date -Ins).fossil; \
+fossil clone ssh://%i@localhost/fossil-instance-1 db~$(date -Ins).fossil; \
+fossil clone ssh://%i@localhost/a/b/c/fossil-instance-2 db~$(date -Ins).fossil; \
+fossil clone ssh://%i@localhost/fossil/db db~$(date -Ins).fossil; \
 '