2Shirt/duplicity-backup.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Follow-up fix Issue #16

Browse source
This commit is contained in:
Zertrin 2012-08-23 17:35:35 +02:00
parent 449c26d596
commit 413e053c62
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
duplicity-backup.sh
View file

@ -145,9 +145,11 @@ else
exit 1 exit 1
fi fi
SIGN_PASSPHRASE=$PASSPHRASE
export AWS_ACCESS_KEY_ID export AWS_ACCESS_KEY_ID
export AWS_SECRET_ACCESS_KEY export AWS_SECRET_ACCESS_KEY
export PASSPHRASE export PASSPHRASE
export SIGN_PASSPHRASE
LOGFILE="${LOGDIR}${LOG_FILE}" LOGFILE="${LOGDIR}${LOG_FILE}"
DUPLICITY="$(which duplicity)" DUPLICITY="$(which duplicity)"
@ -359,14 +361,13 @@ duplicity_backup()
>> ${LOGFILE} >> ${LOGFILE}
} }
setup_passphrases_for_restore() setup_passphrase()
{ {
if [ ! -z "$GPG_ENC_KEY" -a ! -z "$GPG_SIGN_KEY" -a "$GPG_ENC_KEY" != "$GPG_SIGN_KEY" ]; then if [ ! -z "$GPG_ENC_KEY" -a ! -z "$GPG_SIGN_KEY" -a "$GPG_ENC_KEY" != "$GPG_SIGN_KEY" ]; then
SIGN_PASSPHRASE=$PASSPHRASE echo -n "Please provide the passphrase for decryption (GPG key 0x${GPG_ENC_KEY}): "
echo "Please provide the passphrase for decryption (GPG key 0x${GPG_ENC_KEY}):" builtin read -s ENCPASSPHRASE
read -e ENCPASSPHRASE echo -ne "\n"
PASSPHRASE=$ENCPASSPHRASE PASSPHRASE=$ENCPASSPHRASE
export SIGN_PASSPHRASE
export PASSPHRASE export PASSPHRASE
fi fi
} }
@ -476,6 +477,8 @@ case "$COMMAND" in
echo -e "-------[ Verifying Source & Destination ]-------\n" >> ${LOGFILE} echo -e "-------[ Verifying Source & Destination ]-------\n" >> ${LOGFILE}
include_exclude include_exclude
setup_passphrase
echo -e "Attempting to verify now ..."
duplicity_backup duplicity_backup
OLDROOT=${ROOT} OLDROOT=${ROOT}
@ -507,7 +510,7 @@ case "$COMMAND" in
DEST=$RESTORE_DEST DEST=$RESTORE_DEST
fi fi
setup_passphrases_for_restore setup_passphrase
echo "Attempting to restore now ..." echo "Attempting to restore now ..."
duplicity_backup duplicity_backup
;; ;;
@ -545,7 +548,7 @@ case "$COMMAND" in
FILE_TO_RESTORE="'"$FILE_TO_RESTORE"'" FILE_TO_RESTORE="'"$FILE_TO_RESTORE"'"
DEST="'"$DEST"'" DEST="'"$DEST"'"
setup_passphrases_for_restore setup_passphrase
echo "Restoring now ..." echo "Restoring now ..."
#use INCLUDE variable without create another one #use INCLUDE variable without create another one
INCLUDE="--file-to-restore ${FILE_TO_RESTORE}" INCLUDE="--file-to-restore ${FILE_TO_RESTORE}"