Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2024-12-26 15:33:41 +01:00
Code Issues Releases Wiki Activity

WIP: making encryption coherent

Browse Source
This commit is contained in:
deajan 2016-09-01 22:55:11 +02:00
parent 35c7dc97c2
commit 6647a7be59
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dev/n_obackup.sh
View File

@ -997,7 +997,7 @@ function EncryptFiles {
successCounter=$((successCounter+1)) successCounter=$((successCounter+1))
Logger "Encrypted file [$sourceFile]." "VERBOSE" Logger "Encrypted file [$sourceFile]." "VERBOSE"
fi fi
done < <(find "$filePath" $recursiveArgs -type f -print0) done < <(find "$filePath" $recursiveArgs -type f ! -name "*$cryptFileExtension" -print0)
Logger "Encrypted [$successCounter] files successfully." "NOTICE" Logger "Encrypted [$successCounter] files successfully." "NOTICE"
if [ $errorCounter -gt 0 ]; then if [ $errorCounter -gt 0 ]; then
Logger "Failed to encrypt [$errorCounter] files." "CRITICAL" Logger "Failed to encrypt [$errorCounter] files." "CRITICAL"
@ -1045,7 +1045,7 @@ function DecryptFiles {
Logger "Cannot delete original file [$encryptedFile] after decryption." "ERROR" Logger "Cannot delete original file [$encryptedFile] after decryption." "ERROR"
fi fi
fi fi
done < <(find "$filePath" -type f -iname "*$cryptFileExtension" -print0) done < <(find "$filePath" -type f -name "*$cryptFileExtension" -print0)
Logger "Decrypted [$successCounter] files successfully." "NOTICE" Logger "Decrypted [$successCounter] files successfully." "NOTICE"
if [ $errorCounter -gt 0 ]; then if [ $errorCounter -gt 0 ]; then
Logger "Failed to decrypt [$errorCounter] files." "CRITICAL" Logger "Failed to decrypt [$errorCounter] files." "CRITICAL"
@ -1120,6 +1120,7 @@ function FilesBackup {
local backupTask local backupTask
local backupTasks local backupTasks
local path
IFS=$PATH_SEPARATOR_CHAR read -r -a backupTasks <<< "$FILE_BACKUP_TASKS" IFS=$PATH_SEPARATOR_CHAR read -r -a backupTasks <<< "$FILE_BACKUP_TASKS"
for backupTask in "${backupTasks[@]}"; do for backupTask in "${backupTasks[@]}"; do
@ -1134,7 +1135,13 @@ function FilesBackup {
elif [ "$ENCRYPTION" == "yes" ] && [ "$BACKUP_TYPE" == "pull" ]; then elif [ "$ENCRYPTION" == "yes" ] && [ "$BACKUP_TYPE" == "pull" ]; then
Rsync "$backupTask" true Rsync "$backupTask" true
if [ $? == 0 ]; then if [ $? == 0 ]; then
EncryptFiles "$backupTask" true #TODO: Test KEEP_ABSOLUTE_PATH=no
if [ "$KEEP_ABSOLUTE_PATH" != "no" ]; then
path="$FILE_STORAGE/$backupTask"
else
path="$FILE_STORAGE/$(basename "$backupTask")"
fi
EncryptFiles "$path" "$path" "$GPG_RECIPIENT" true
fi fi
else else
Rsync "$backupTask" true Rsync "$backupTask" true
@ -1155,7 +1162,12 @@ function FilesBackup {
elif [ "$ENCRYPTION" == "yes" ] && [ "$BACKUP_TYPE" == "pull" ]; then elif [ "$ENCRYPTION" == "yes" ] && [ "$BACKUP_TYPE" == "pull" ]; then
Rsync "$backupTask" false Rsync "$backupTask" false
if [ $? == 0 ]; then if [ $? == 0 ]; then
EncryptFiles "$backupTask" false if [ "$KEEP_ABSOLUTE_PATH" != "no" ]; then
path="$FILE_STORAGE/$backupTask"
else
path="$FILE_STORAGE/$(basename "$backupTask")"
fi
EncryptFiles "$path" "$path" "$GPG_RECIPIENT" false
fi fi
else else
Rsync "$backupTask" false Rsync "$backupTask" false
@ -1177,7 +1189,12 @@ function FilesBackup {
elif [ "$ENCRYPTION" == "yes" ] && [ "$BACKUP_TYPE" == "pull" ]; then elif [ "$ENCRYPTION" == "yes" ] && [ "$BACKUP_TYPE" == "pull" ]; then
Rsync "$backupTask" true Rsync "$backupTask" true
if [ $? == 0 ]; then if [ $? == 0 ]; then
EncryptFiles "$backupTask" true if [ "$KEEP_ABSOLUTE_PATH" != "no" ]; then
path="$FILE_STORAGE/$backupTask"
else
path="$FILE_STORAGE/$(basename "$backupTask")"
fi
EncryptFiles "$path" "$path" "$GPG_RECIPIENT" true
fi fi
else else
Rsync "$backupTask" true Rsync "$backupTask" true