diff options
author | u <u@billy> | 2023-05-30 16:40:54 -0400 |
---|---|---|
committer | u <u@billy> | 2023-05-30 16:40:54 -0400 |
commit | c8048d5df939c1c3bc75b939f11f30b3224ff02a (patch) | |
tree | beeafebcd3a950a0fa033f8bb9f7c3f416f60b2a | |
parent | 0dc6286194bb7423d163b63ae7cedd37f0629630 (diff) |
install-deps target
-rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -10,6 +10,7 @@ unit_instance = $(our_name)@$(unit_instance_name).service | |||
10 | 10 | ||
11 | default: install start test | 11 | default: install start test |
12 | install: | 12 | install: |
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) |
18 | follow: | 19 | follow: |
19 | journalctl --user $(addprefix -u , $(unit_instances)) -f | 20 | journalctl --user $(addprefix -u , $(unit_instances)) -f |
20 | test: | 21 | test 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 | |||
46 | units = $(filter-out %@.service,$(notdir $(unit_files))) | 47 | units = $(filter-out %@.service,$(notdir $(unit_files))) |
47 | executables = src/endofossil | 48 | executables = src/endofossil |
48 | bindir = /usr/local/bin | 49 | bindir = /usr/local/bin |
49 | dependencies = socat fossil ssh fakeroot | 50 | dependencies = socat fossil ssh fakeroot libnss-systemd |
50 | 51 | ||
51 | SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi | 52 | SSH_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 |
62 | install-debs: | 63 | deps install-deps: |
63 | apt install --mark-auto --no-upgrade $(dependencies) | 64 | apt install --mark-auto --no-upgrade $(dependencies) |
64 | test: install | 65 | test: 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 |