From 0d90b7b36863f49f3d20c265ea7adfbe54dc1ae9 Mon Sep 17 00:00:00 2001 From: Benedikt Morbach Date: Wed, 4 May 2016 15:11:20 +0200 Subject: [PATCH] respect BINDIR in systemd and cron files --- Makefile | 2 ++ contrib/cron/btrbk-mail | 2 +- contrib/systemd/btrbk.service | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 121c76f..2faa997 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,13 @@ install-systemd: @echo 'installing systemd service units...' install -Dm644 contrib/systemd/btrbk.service "$(DESTDIR)$(SYSTEMDDIR)/btrbk.service" install -Dm644 contrib/systemd/btrbk.timer "$(DESTDIR)$(SYSTEMDDIR)/btrbk.timer" + sed -i -e "s#@BINDIR@#$(BINDIR)#g" "$(DESTDIR)$(SYSTEMDDIR)/btrbk.service" install-share: @echo 'installing auxiliary scripts...' install -Dm755 ssh_filter_btrbk.sh "$(DESTDIR)$(SCRIPTDIR)/ssh_filter_btrbk.sh" install -Dm755 contrib/cron/btrbk-mail "$(DESTDIR)$(SCRIPTDIR)/btrbk-mail" + sed -i -e "s#@BINDIR@#$(BINDIR)#g" "$(DESTDIR)$(SCRIPTDIR)/btrbk-mail" install-man: @echo 'installing manpages...' diff --git a/contrib/cron/btrbk-mail b/contrib/cron/btrbk-mail index 9143f2d..47be3d3 100755 --- a/contrib/cron/btrbk-mail +++ b/contrib/cron/btrbk-mail @@ -106,7 +106,7 @@ done # run btrbk # log_info "running btrbk" -ret=$(/usr/sbin/btrbk -c "$config" ${btrbk_opts:-} run 2>&1) +ret=$(@BINDIR@/btrbk -c "$config" ${btrbk_opts:-} run 2>&1) exitcode=$? case $exitcode in 0) status="All backups successful" diff --git a/contrib/systemd/btrbk.service b/contrib/systemd/btrbk.service index 3723470..bc8b769 100644 --- a/contrib/systemd/btrbk.service +++ b/contrib/systemd/btrbk.service @@ -3,4 +3,4 @@ Description=btrbk backup [Service] Type=oneshot -ExecStart=/usr/sbin/btrbk run +ExecStart=@BINDIR@/btrbk run