@@ -1,3 +1,14 @@

[chiark-utils.git] / backup / snaprsync

diff --git a/backup/snaprsync b/backup/snaprsync
index 814514085f059f689afc44976ad86c9e550e7b52..3238f392c624af47c90ac11e315691264351a6e0 100755 (executable)
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -82,8 +82,7 @@ ssh $rhost <$td/sentinel 4<&- "
   umask 077
   exec 3>$rsumsfile
   cd snap-mount
-  $summer . | sort -t' ' -k2 >&3
-  test x\"\${PIPESTATUS[*]}\" = 'x0 0'
+  $summer . >&3
   date -u '+$rhost $datefmt sumsdone'
   cd ..
 " &
@@ -95,8 +94,7 @@ date -u "+ $datefmt rsyncdone"
 
 exec 3>$localarea,lsums
 (cd $localarea && \
- $summer . | sort -t'  ' -k2 >&3 && \
- test x"${PIPESTATUS[*]}" = 'x0 0') &
+ $summer .) &
 xspawned lsum
 exec 3>&-
 
@@ -116,7 +114,7 @@ xwait $lsum
 date -u "+ $datefmt checking"
 
 set +e
-x diff -u "$localarea,rsums" "$localarea,lsums" >"$localarea,sumsdiff"
+diff -u "$localarea,rsums" "$localarea,lsums" >"$localarea,sumsdiff"
 diffrc=$?
 set -e
 test $diffrc = 0 || test $diffrc = 1