respect DESTBINDIR

yseto · Feb 26, 2023 · 18a1380 · 18a1380
1 parent 354976b
commit 18a1380
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -13,6 +13,6 @@ install: sabatrapd
 	@install -m 644 sabatrapd.yml.sample $(DESTETCDIR)/sabatrapd.yml
 	@install -m 644 systemd/sabatrapd.env $(DESTETCDIR)/sabatrapd.env
 	@install -m 644 systemd/sabatrapd.service `systemd-path systemd-system-unit`
-	@sed -i -e "s|%DESTETCDIR%|$(DESTETCDIR)|" `systemd-path systemd-system-unit`/sabatrapd.service
+	@sed -i -e "s|%DESTBINDIR%|$(DESTBINDIR)|" -e "s|%DESTETCDIR%|$(DESTETCDIR)|" `systemd-path systemd-system-unit`/sabatrapd.service
 	@echo "Installation is finished."
 	@echo "Modify $(DESTETCDIR)/sabatrapd.yml, then run 'systemctl enable sabatrapd.service && systemctl start sabatrapd.service'"
diff --git a/install.sh b/install.sh
@@ -12,7 +12,7 @@ install -m 755 sabatrapd $DESTBINDIR || exit 1
 install -m 644 sabatrapd.yml $DESTETCDIR/sabatrapd.yml || exit 1
 install -m 644 systemd/sabatrapd.env $DESTETCDIR/sabatrapd.env || exit 1
 install -m 644 systemd/sabatrapd.service `systemd-path systemd-system-unit` || exit 1
-sed -i -e "s|%DESTETCDIR%|$DESTETCDIR|" `systemd-path systemd-system-unit`/sabatrapd.service || exit 1
+sed -i -e "s|%DESTBINDIR%|$DESTBINDIR|" -e "s|%DESTETCDIR%|$DESTETCDIR|" `systemd-path systemd-system-unit`/sabatrapd.service || exit 1
 systemctl enable sabatrapd.service || exit 1
 systemctl start sabatrapd.service || exit 1
 echo "sabatrapd installation is finished."

diff --git a/systemd/sabatrapd.service b/systemd/sabatrapd.service
@@ -5,7 +5,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-%DESTETCDIR%/sabatrapd.env
-ExecStart=/usr/local/bin/sabatrapd -conf %DESTETCDIR%/sabatrapd.yml
+ExecStart=%DESTBINDIR%/sabatrapd -conf %DESTETCDIR%/sabatrapd.yml
 
 [Install]
 WantedBy=multi-user.target