rename backup -> hardlinked-backup

* avoid file conflict with tar's /usr/bin/backup script

6 files changed, 8 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 0aa8bb6..4987e86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
-backup
 backup@.service
 backup@.timer
 backup-progress
 backup-statistics
 fast-repair
 forwarddown
+hardlinked-backup
 last-backups
 remove-old-backups
 man.commons
diff --git a/Makefile b/Makefile
index 1e7b867..9a37b27 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ MANDIR	 = /usr/share/man
 VERSION  = 1.7
 
 all: man.commons \
- backup backup.1 \
+ hardlinked-backup hardlinked-backup.1 \
  backup@.service backup@.timer \
  backup-progress \
  backup-statistics backup-statistics.1 \
@@ -55,9 +55,9 @@ all: man.commons \
 .PHONY:	install dist clean
 
 install: all
-	install -D -m0755 -t $(DESTDIR)$(BINDIR) backup backup-progress backup-statistics forwarddown last-backups remove-old-backups
+	install -D -m0755 -t $(DESTDIR)$(BINDIR) backup-progress backup-statistics forwarddown hardlinked-backup last-backups remove-old-backups
 	install -D -m0644 -t $(DESTDIR)$(LIBDIR)/systemd/system backup@.service backup@.timer remove-old-backups.service remove-old-backups.timer
-	install -D -m0644 -t $(DESTDIR)$(MANDIR)/man1 backup.1 backup-statistics.1 forwarddown.1 last-backups.1 remove-old-backups.1
+	install -D -m0644 -t $(DESTDIR)$(MANDIR)/man1 backup-statistics.1 forwarddown.1 hardlinked-backup.1 last-backups.1 remove-old-backups.1
 	install -D -m0644 -t $(DESTDIR)$(ETCDIR) backup.conf
 	install -D -m0755 -T sendmailadvanced.hook $(DESTDIR)$(ETCDIR)/sendmailadvanced.hooks/last-backups
 
diff --git a/backup@.service.in b/backup@.service.in
index 19fef7d..4ce52d5 100644
--- a/backup@.service.in
+++ b/backup@.service.in
@@ -5,7 +5,7 @@ After=network-online.target local-fs.target
 
 [Service]
 Type=simple
-ExecStart=#BINDIR#/backup %I
+ExecStart=#BINDIR#/hardlinked-backup %I
 SuccessExitStatus=4
 RestartForceExitStatus=5 11
 RestartSec=10
diff --git a/backup.in b/hardlinked-backup.in
index f530e08..d5c76e2 100755
--- a/backup.in
+++ b/hardlinked-backup.in
@@ -11,7 +11,7 @@ rsync --help | \
 usage()
 {
   >&2 echo \
-'Usage:  backup /tmp/pidFile /path/to/destination/ user@source:path [proxy_user@ssh_host]
+'Usage:  hardlinked-backup /tmp/pidFile /path/to/destination/ user@source:path [proxy_user@ssh_host]
 Backup files from remote with rsync, possibly via SSH-tunnel.
 
 With no arguments, information is expected to be in array $backups in #ETCDIR#/backup.conf with name of executable (e.g. a symlink) as key.
diff --git a/last-backups.in b/last-backups.in
index 61117d0..a636f46 100755
--- a/last-backups.in
+++ b/last-backups.in
@@ -71,7 +71,7 @@ do
       '
     )
   )
-  if [ -f "/tmp/${backupID}.pid" ] && pgrep '(^|/|\s)backup\S*$' | grep -qxF "$(cat "/tmp/${backupID}.pid")"; then
+  if [ -f "/tmp/${backupID}.pid" ] && pgrep '(^|/|\s)hardlinked-backup\S*$' | grep -qxF "$(cat "/tmp/${backupID}.pid")"; then
     laeuft='_laeuft'
   else
     laeuft=''
diff --git a/man.commons.in b/man.commons.in
index 4ebb720..d94775f 100644
--- a/man.commons.in
+++ b/man.commons.in
@@ -3,8 +3,8 @@
 [AUTHOR]
 Erich Eckner <opensource at eckner dot net>.
 [SEE ALSO]
-backup(1)
 backup-statistics(1)
+hardlinked-backup(1)
 last-backups(1)
 remove-old-backups(1)
 [CONFIG]