line break
This commit is contained in:
parent
e43bdd9458
commit
a3a643dd23
13
btrbk
13
btrbk
|
@ -18,9 +18,11 @@ function bkRun {
|
||||||
sync
|
sync
|
||||||
fi
|
fi
|
||||||
if [[ -d "$snapLast" && $1 = "incremental" ]]; then
|
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
|
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
|
if [[ $1 = "full" ]]; then
|
||||||
for o in ${!bkSuffix[@]}; do
|
for o in ${!bkSuffix[@]}; do
|
||||||
mapfile -t oldBk < <(rclone lsf $RCLONEDIR | grep ....-..-${bkSuffix[$o]} | head -n -${keepTime[$o]})
|
mapfile -t oldBk < <(rclone lsf $RCLONEDIR | grep ....-..-${bkSuffix[$o]} | head -n -${keepTime[$o]})
|
||||||
|
@ -103,7 +105,8 @@ function runFullRestore {
|
||||||
echo "Enter gpg Passphrase"
|
echo "Enter gpg Passphrase"
|
||||||
while true; do
|
while true; do
|
||||||
read -e -s -r -p "Passphrase: " gpgPass
|
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"
|
echo "Wrong Passphrase"
|
||||||
done;;
|
done;;
|
||||||
esac
|
esac
|
||||||
|
@ -113,7 +116,9 @@ function runFullRestore {
|
||||||
for i in ${!bkSuffix[@]}; do
|
for i in ${!bkSuffix[@]}; do
|
||||||
mapfile -t bkFile < <(rclone lsf "$rcloneDir$lastBkDate${bkSuffix[$i]}" 2>/dev/null)
|
mapfile -t bkFile < <(rclone lsf "$rcloneDir$lastBkDate${bkSuffix[$i]}" 2>/dev/null)
|
||||||
for o in ${!bkFile[@]}; do
|
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
|
||||||
done
|
done
|
||||||
for i in ${!VOLNAME[@]}; do
|
for i in ${!VOLNAME[@]}; do
|
||||||
|
|
Loading…
Reference in a new issue