Remove references to user "u". Uses $SUDO_USER.

1 files changed, 7 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 48079f6..30850b8 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,11 @@ work:
 work/.fslckout: | work $(fossil_database)
         cd work && fossil open ../$(fossil_database)
 else
+ifdef SUDO_USER
+THE_USER=$(SUDO_USER)
+else
+$(error "you must define THE_USER")
+endif
 unitdir = /etc/systemd/system
 unit_files = $(addprefix src/fossil-user,@.service .socket)
 units = $(filter-out %@.service,$(notdir $(unit_files)))
@@ -42,7 +47,8 @@ bindir = /usr/local/bin
 
 default: install start follow
 install:
-        install -t /etc/ssh/ -- src/user-d.AnonymousForceCommand src/user-d.AuthorizedKeysCommand
+        install -t /etc/ssh/ -- src/AuthorizedKeysCommand
+        install -T -- src/AnonymousForceCommand /etc/ssh/user-$(THE_USER).AnonymousForceCommand
         install -m644 -t /etc/ssh/sshd_config.d -- src/fossil-user.conf
         install -m644 -t $(unitdir) -- $(unit_files)
         install -t $(bindir) -- $(executables)