emily/btrbk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

minor fixes

Browse source
This commit is contained in:
snaki 2022-07-08 13:23:19 +02:00
parent 8326d66c57
commit a14f346546
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
btrbk
View file

@ -35,7 +35,7 @@ function bkRun {
btrfs subvolume delete $SNAPDIR${oldSnaps[$snap]} btrfs subvolume delete $SNAPDIR${oldSnaps[$snap]}
done done
done done
rclone copy /etc/btrbk.conf $RCLONEDIR"config/" rclone sync /etc/btrbk.conf $RCLONEDIR"config/"
end end
} }
@ -102,7 +102,7 @@ function runFullRestore {
*) *)
echo "Enter gpg Passphrase" echo "Enter gpg Passphrase"
while true; do while true; do
read -e -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;;
@ -120,11 +120,17 @@ function runFullRestore {
newestSnap=$(ls -a $restoreDir"restore" | grep ${VOLNAME[$i]}.\....-..- | tail -n -1 ) newestSnap=$(ls -a $restoreDir"restore" | grep ${VOLNAME[$i]}.\....-..- | tail -n -1 )
btrfs subvolume snapshot $restoreDir"restore/"$newestSnap $restoreDir${VOLNAME[$i]} btrfs subvolume snapshot $restoreDir"restore/"$newestSnap $restoreDir${VOLNAME[$i]}
done done
mapfile -t delVol < <(ls $restoreDir"restore") read -e -r -p "Delete restore subvolume?[Y/n]: " delOldVol
for i in ${!delVol[@]}; do case $delOldVol in
btrfs subvolume delete $restoreDir"restore/"${delVol[$i]} [nN]) ;;
done *)
btrfs subvolume delete $restoreDir"restore" mapfile -t delVol < <(ls $restoreDir"restore")
for i in ${!delVol[@]}; do
btrfs subvolume delete $restoreDir"restore/"${delVol[$i]}
done
btrfs subvolume delete $restoreDir"restore";;
esac
btrfs subvolume create $restoreDir"snapshots"
end end
} }
@ -153,13 +159,14 @@ function testConf {
testDate testDate
fi fi
else else
echo "pubkey wrong or not found exit code: $?" echo "pubkey wrong or not found"
exit 1 exit 1
fi fi
else else
echo "rclone dir wrong or not found exit code: $?" echo "rclone dir wrong or not found"
exit 1 exit 1
fi fi
exit 1
} }
function testDate { function testDate {
@ -172,7 +179,7 @@ function testDate {
function end { function end {
echo "finished in $(( ($(date +%s) - startDate) / 60 )) min" echo "finished in $(( ($(date +%s) - startDate) / 60 )) min"
exit 1 exit 0
} }
function echoHelp { function echoHelp {
@ -191,14 +198,14 @@ function echoHelp {
options=$(getopt -l "backup,force,date::,restore::,full-restore::,help" -o "bfd::r::x::h" -- "$@") options=$(getopt -l "backup,force,date::,restore::,full-restore::,help" -o "bfd::r::x::h" -- "$@")
eval set -- "$options" eval set -- "$options"
while true; do for i in ${!options[@]}; do
case $1 in case $1 in
-b|--backup) backup=true; shift;; -b|--backup) backup=true; shift;;
-f|--force) force=true; shift;; -f|--force) force=true; shift;;
--date) rDate="$2"; shift;; --date) rDate="$2"; shift;;
--restore) restore=true; restoreVol=$2; shift;; --restore) restore=true; restoreVol=$2; shift;;
--full-restore) fullRestore=true; restoreDir=$2; shift;; --full-restore) fullRestore=true; restoreDir=$2; shift;;
-h|--help) Help; shift; break;; -h|--help) echoHelp; shift; break;;
--) shift; break;; --) shift; break;;
\?) echo "error"; exit 1;; \?) echo "error"; exit 1;;
esac esac
@ -207,8 +214,6 @@ done
if [ "$fullRestore" = true ]; then if [ "$fullRestore" = true ]; then
runFullRestore runFullRestore
elif [ "$backup" = true ]; then
testConf
else else
echoHelp testConf
fi fi