From 30e67c848e40524eee11f860baeb59dd9e59df93 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sun, 28 May 2023 19:54:57 -0400 Subject: push-btrfs improvements --- src/push-btrfs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/push-btrfs b/src/push-btrfs index 41ffd7f..135de34 100755 --- a/src/push-btrfs +++ b/src/push-btrfs @@ -17,7 +17,7 @@ check_dependencies() { for c in flock jq btrfs pv realpath stat egrep date mv ln rm do - command -v $c >/dev/null + command -v "$c" >/dev/null || die "missing dependency: $c" done } @@ -45,7 +45,8 @@ get_age() btrfs_receive() { - ssh -- "${1%%:*}" btrfs receive -- "${1#*:}" + ssh_cmdline=(ssh -- "${1%%:*}") + "${ssh_cmdline[@]}" bash -c $(printf %q 'set -x; ([ -d "$0" ] || mkdir -p "$0") && btrfs receive -- "$0"') $(printf %q "${1#*:}") } set -e @@ -100,7 +101,7 @@ fi new_snapshot=${src%/}/.snapshot~$(date -Ins) btrfs subvolume snapshot -r -- "$src" "$new_snapshot" -if ! btrfs send ${remote_head:+ -p "$remote_head"} -- "$new_snapshot" | pv | btrfs_receive "$dst" +if ! btrfs send ${remote_head:+ -p "$remote_head"} -- "$new_snapshot" | btrfs_receive "$dst" then btrfs subvolume delete "$new_snapshot" exit 1 -- cgit v1.2.3