X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e525519509bc2c633b8f7f9880290f632d7240b6..7918f2440534993bdda324da839b2ea9a3884757:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index 115ae6bc..eaad40a3 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -52,10 +52,13 @@ runtest() { # messages). This isn't needed if you use -i without -v. filter_outfile() { sed -e '/^building file list /d' \ + -e '/^sending incremental file list/d' \ -e '/^created directory /d' \ -e '/^done$/d' \ -e '/ --whole-file$/d' \ -e '/^total: /d' \ + -e '/^client charset: /d' \ + -e '/^server charset: /d' \ -e '/^$/,$d' \ <"$outfile" >"$outfile.new" mv "$outfile.new" "$outfile" @@ -66,7 +69,7 @@ printmsg() { } rsync_ls_lR() { - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS } check_perms() { @@ -145,16 +148,16 @@ hands_setup() { # Many machines do not have "mkdir -p", so we have to build up long paths. # How boring. makepath() { - echo " makepath $1" - p="$1" - ( + for p in "${@}"; do + (echo " makepath $p" + # Absolut Unix. if echo $p | grep '^/' >/dev/null then cd / fi - # This will break if $1 contains a space. + # This will break if $p contains a space. for c in `echo $p | tr '/' ' '` do if [ -d "$c" ] || mkdir "$c" @@ -163,8 +166,8 @@ makepath() { else echo "failed to create $c" >&2; return $? fi - done - ) + done) + done } @@ -231,7 +234,7 @@ build_rsyncd_conf() { pid file = $pidfile use chroot = no -hosts allow = localhost 127.0.0.1 $hostname +hosts allow = localhost 127.0.0.1 10.0.1.2 $hostname log file = $logfile log format = %i %h [%a] %m (%u) %l %f%L transfer logging = yes