summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoru <u@billy>2023-05-30 16:40:54 -0400
committeru <u@billy>2023-05-30 16:40:54 -0400
commitc8048d5df939c1c3bc75b939f11f30b3224ff02a (patch)
treebeeafebcd3a950a0fa033f8bb9f7c3f416f60b2a
parent0dc6286194bb7423d163b63ae7cedd37f0629630 (diff)
install-deps target
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1a2d881..bdcbef9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ unit_instance = $(our_name)@$(unit_instance_name).service
10 10
11default: install start test 11default: install start test
12install: 12install:
13 sudo make install-deps
13 install -m644 -t $(unitdir) -- $(unit_files) 14 install -m644 -t $(unitdir) -- $(unit_files)
14 systemctl --user daemon-reload 15 systemctl --user daemon-reload
15 sudo make $@ 16 sudo make $@
@@ -17,7 +18,7 @@ start stop restart status show: | $(fossil_database)
17 systemctl --user $@ $(unit_instances) 18 systemctl --user $@ $(unit_instances)
18follow: 19follow:
19 journalctl --user $(addprefix -u , $(unit_instances)) -f 20 journalctl --user $(addprefix -u , $(unit_instances)) -f
20test: 21test deps:
21 sudo $(MAKE) -$(MAKEFLAGS) $@ 22 sudo $(MAKE) -$(MAKEFLAGS) $@
22 23
23 24
@@ -46,7 +47,7 @@ unit_files = $(addprefix src/fossil-user,@.service .socket) src/fossil-test@.ser
46units = $(filter-out %@.service,$(notdir $(unit_files))) 47units = $(filter-out %@.service,$(notdir $(unit_files)))
47executables = src/endofossil 48executables = src/endofossil
48bindir = /usr/local/bin 49bindir = /usr/local/bin
49dependencies = socat fossil ssh fakeroot 50dependencies = socat fossil ssh fakeroot libnss-systemd
50 51
51SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi 52SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi
52 53
@@ -59,7 +60,7 @@ install:
59 install -t $(bindir) -- $(executables) 60 install -t $(bindir) -- $(executables)
60 systemctl daemon-reload 61 systemctl daemon-reload
61 systemctl reload ssh 62 systemctl reload ssh
62install-debs: 63deps install-deps:
63 apt install --mark-auto --no-upgrade $(dependencies) 64 apt install --mark-auto --no-upgrade $(dependencies)
64test: install 65test: install
65 journalctl -f -u fossil-test@$(SSH_USERNAME) & p=$$!; systemctl start --wait fossil-test@$(SSH_USERNAME); sleep 1; kill $$p 66 journalctl -f -u fossil-test@$(SSH_USERNAME) & p=$$!; systemctl start --wait fossil-test@$(SSH_USERNAME); sleep 1; kill $$p