[backup.sh] Better directory logic Better directory logicss

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/shtrom/scripts@815 1991c358-8f32-0410-a49a-990740bdf4c2

1 files changed, 6 insertions, 6 deletions

diff --git a/openbsd/backup.sh b/openbsd/backup.sh
index 058ac6a..d4c2a1c 100755
--- a/openbsd/backup.sh
+++ b/openbsd/backup.sh
@@ -1,24 +1,24 @@
 #!/bin/sh
 # $Id$
 DIRS="/etc /srv /home/shtrom"
-BACKUPDIR="/srv/rdiff-backup"
-LOCALBACKUPDIR="/srv/rdiff-backup/`hostname -s`"
+BACKUPROOT="/srv/rdiff-backup"
+BACKUPDIR="${BACKUPROOT}/`hostname -s`"
 BACKUPSERVER=backup.narf.ssji.net
-REMOTEBACKUPDIR="`hostname -s`@${BACKUPSERVER}::${BACKUPDIR}/`hostname -s`"
+REMOTEBACKUPDIR="`hostname -s`@${BACKUPSERVER}::${BACKUPDIR}"
 
 if [ "$1" = "remote" ]; then
 	EFFECTIVEBACKUPDIR=${REMOTEBACKUPDIR}
 	REMOTESCHEMA="ssh -qT -i /etc/ssh/ssh_host_rsa_key %s"
 else
-	EFFECTIVEBACKUPDIR=${LOCALBACKUPDIR}
+	EFFECTIVEBACKUPDIR=${BACKUPDIR}
 	REMOTESCHEMA=""
 fi
 
 echo -n "Backing up to ${EFFECTIVEBACKUPDIR}:"
 for DIR in $DIRS; do
 	echo -n " $DIR"
-	if [ "`dirname $BACKUPDIR`" = "$DIR" ]; then
-		EXCL="--exclude $BACKUPDIR"
+	if [ "`dirname $BACKUPROOT`" = "$DIR" ]; then
+		EXCL="--exclude $BACKUPROOT"
 	else
 		EXCL=""
 	fi