From d51de9860448ffc85738be553c9e81914aed94e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=BCll?= Date: Mon, 18 Jan 2016 23:05:39 +0100 Subject: [PATCH 1/2] Revert the hack for shell-based run_cmd() causing problems on zsh. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Düll --- btrbk | 1 - 1 file changed, 1 deletion(-) diff --git a/btrbk b/btrbk index 050bce0..04f1923 100755 --- a/btrbk +++ b/btrbk @@ -1285,7 +1285,6 @@ sub btrfs_send_receive($$$$) cmd => [ qw(btrfs receive), @receive_options, $target_path . '/' ], rsh => $target->{RSH}, name => "btrfs receive", - catch_stderr => 1, # hack for shell-based run_cmd() filter_stderr => sub { $err = $_; $_ = undef } }; From e7aa6921106b5c45196a814a6acafc8ae37bb3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=BCll?= Date: Mon, 18 Jan 2016 23:07:52 +0100 Subject: [PATCH 2/2] Make pv more useful by passing parameters. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disabling the non-functional progress bar and adding average and written byte counters. Signed-off-by: Michael Düll --- btrbk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btrbk b/btrbk index 04f1923..45137e1 100755 --- a/btrbk +++ b/btrbk @@ -1279,7 +1279,7 @@ sub btrfs_send_receive($$$$) name => "btrfs send", }; push @cmd_pipe, { - cmd => [ '/usr/bin/pv' ], + cmd => [ '/usr/bin/pv', '-traeb' ], } if($show_progress); push @cmd_pipe, { cmd => [ qw(btrfs receive), @receive_options, $target_path . '/' ],