X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Fsnaprsync;h=91b2ce8948c8831ceab153e84bf503592d3c174e;hp=3e3391fb6ac6d3d7b933e7c8919ab25e044a4c4a;hb=ddf1735cb23500098438763348d49bcb2bae101d;hpb=8d1cd6396809a3d22dd6a6ff25666fec491c5a53

diff --git a/backup/snaprsync b/backup/snaprsync
index 3e3391f..91b2ce8 100755
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -13,23 +13,28 @@
 	rvardir=/var/lib/chiark-backup
 	bwlimit=
 	subdir=.
+	rsyncopts=
+	rsynccompress=z
+	sshopts=
+	summer=summer
 
 set -e
 
 badusage () { echo >&2 "snaprsync: bad usage: $1"; exit 12; }
-x () { echo "+ $@"; "$@"; }
-xspawned () { eval "${1}pid=$!; echo \"+[$!] ($1) &\";"; }
-xwait () { eval "echo \"+[\$${1}pid] ($1)...\"; wait \$${1}pid;"; }
+nb_echo () { (echo "$@"); } # See Debian #382798
+x () { nb_echo "+ $@"; "$@"; }
+xspawned () { eval "${1}pid=$!; nb_echo \"+[$!] ($1) &\";"; }
+xwait () { eval "nb_echo \"+[\$${1}pid] ($1)...\"; wait \$${1}pid;"; }
 
 while true; do
 	case "$1" in
-	--?*=?*)
+	--?*=*)
 		name=${1#--}; name=${name%%=*}
 		value=${1#--*=}
 		case "$name" in
 		rhost|device|mountpoint|localarea);;
 		localprevious|snapkind|rsharedir|retcdir|rvardir|bwlimit);;
-		subdir);;
+		subdir|rsyncopts|rsynccompress|sshopts|summer);;
 		*) badusage "unknown setting $name";;
 		esac
 		eval "$name=\$value"
@@ -51,18 +56,18 @@ done
 
 datefmt='%Y-%m-%d %H:%M:%S Z'
 rsync="rsync ${bwlimit:+--bwlimit} $bwlimit"
-export RSYNC_RSH='ssh -o compression=no'
+export RSYNC_RSH="ssh -o compression=no $sshopts"
 sshpfx='PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin; export PATH; '
 
-ssh $rhost "$sshpfx date -u '+$rhost $datefmt start'"
-ssh $rhost "$sshpfx id"
-ssh $rhost "$sshpfx ls -d $rsharedir"
-ssh $rhost "$sshpfx ls -d $rvardir"
+ssh $sshopts $rhost "$sshpfx date -u '+$rhost $datefmt start'"
+ssh $sshopts $rhost "$sshpfx id"
+ssh $sshopts $rhost "$sshpfx ls -d $rsharedir"
+ssh $sshopts $rhost "$sshpfx ls -d $rvardir"
 
 test -d $localarea || x mkdir $localarea
 ournode=`uname -n`
 rsumsfile=for-$ournode.sums
-summer='summer -ACDbtqf'
+summer="$summer -ACDbtqfx"
 
 td=/dev/enoent
 rc=12
@@ -72,16 +77,16 @@ td=`mktemp -td`
 mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 
-x ssh $rhost "$sshpfx $rsharedir/snap-drop"
-ssh $rhost "
+x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop $rvardir"
+ssh $sshopts $rhost "
 	$sshpfx
 	set -e
 	cd $rvardir
 	echo '$retcdir/snap/$snapkind drop $rvardir' >snap-drop.new
 	mv snap-drop.new snap-drop
 "
-x ssh $rhost "$sshpfx $retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
-ssh $rhost <$td/sentinel 4<&- "
+x ssh $sshopts $rhost "$sshpfx $retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
+ssh $sshopts $rhost <$td/sentinel 4<&- "
   $sshpfx
   set -e
   date -u '+$rhost $datefmt main'
@@ -96,7 +101,7 @@ ssh $rhost <$td/sentinel 4<&- "
   cd ..
 " &
 xspawned rsum
-x $rsync -aHSxz --numeric-ids --delete \
+x $rsync -aHSx$rsynccompress --numeric-ids --delete $rsyncopts \
 	${localprevious:+--link-dest} $localprevious \
 	$rhost:$rvardir/snap-mount/$subdir $localarea/.
 date -u "+ $datefmt rsyncdone"
@@ -110,9 +115,9 @@ exec 3>&-
 xwait rsum
 exec 4<&-
 date -u "+ $datefmt sumsdone"
-x ssh $rhost "$sshpfx $rsharedir/snap-drop"
+x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop"
 
-if [ "x${localprevious}" != x ]; then
+if [ "x${localprevious}" != x ] && test -f "$localprevious,rsums"; then
 	cp "$localprevious,rsums" "$localarea,rsums"
 fi
 x $rsync -p \
@@ -123,7 +128,8 @@ xwait $lsum
 date -u "+ $datefmt checking"
 
 set +e
-diff -u "$localarea,rsums" "$localarea,lsums" >"$localarea,sumsdiff"
+diff -u <(sed -e 's/^mountpoint/dir       /' "$localarea,rsums") \
+  "$localarea,lsums" >"$localarea,sumsdiff"
 diffrc=$?
 set -e
 test $diffrc = 0 || test $diffrc = 1