diff --git a/btrbk b/btrbk index 3da8f89..11df0cf 100755 --- a/btrbk +++ b/btrbk @@ -18,9 +18,11 @@ function bkRun { sync fi if [[ -d "$snapLast" && $1 = "incremental" ]]; then - btrfs send -p $snapLast $SNAPDIR$snapName | gpg --batch -er "$PUBKEY" -o - | rclone rcat $RCLONEDIR$month"-${INCR[0]}/"$snapName.pgp + btrfs send -p $snapLast $SNAPDIR$snapName | gpg --batch -er "$PUBKEY" -o - | \ + rclone rcat $RCLONEDIR$month"-${INCR[0]}/"$snapName.pgp else - btrfs send $SNAPDIR$snapName | gpg --batch -er "$PUBKEY" -o - | rclone rcat $RCLONEDIR$month"-${FULL[0]}/"$snapName.pgp + btrfs send $SNAPDIR$snapName | gpg --batch -er "$PUBKEY" -o - | \ + rclone rcat $RCLONEDIR$month"-${FULL[0]}/"$snapName.pgp if [[ $1 = "full" ]]; then for o in ${!bkSuffix[@]}; do mapfile -t oldBk < <(rclone lsf $RCLONEDIR | grep ....-..-${bkSuffix[$o]} | head -n -${keepTime[$o]}) @@ -103,7 +105,8 @@ function runFullRestore { echo "Enter gpg Passphrase" while true; do read -e -s -r -p "Passphrase: " gpgPass - echo | gpg --local-user "$PUBKEY" --pinentry-mode=loopback --passphrase "$gpgPass" -as > /dev/null 2>&1 && echo "Passphrase correct" && break + echo | gpg --local-user "$PUBKEY" --pinentry-mode=loopback --passphrase "$gpgPass" -as > /dev/null 2>&1 && \ + echo "Passphrase correct" && break echo "Wrong Passphrase" done;; esac @@ -113,7 +116,9 @@ function runFullRestore { for i in ${!bkSuffix[@]}; do mapfile -t bkFile < <(rclone lsf "$rcloneDir$lastBkDate${bkSuffix[$i]}" 2>/dev/null) for o in ${!bkFile[@]}; do - rclone cat "$rcloneDir$lastBkDate${bkSuffix[$i]}/${bkFile[$o]}" | gpg --batch --pinentry-mode=loopback --passphrase "$gpgPass" -d | btrfs receive $restoreDir"restore" + rclone cat "$rcloneDir$lastBkDate${bkSuffix[$i]}/${bkFile[$o]}" | \ + gpg --batch --pinentry-mode=loopback --passphrase "$gpgPass" -d | \ + btrfs receive $restoreDir"restore" done done for i in ${!VOLNAME[@]}; do