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

Rebuilt targets

Browse Source
This commit is contained in:
deajan 2018-07-30 17:35:26 +02:00
parent 019e8aa68f
commit 743daeb3d9
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev/debug_obackup.sh
View File

@ -7,7 +7,7 @@ PROGRAM="obackup"
AUTHOR="(C) 2013-2017 by Orsiris de Jong" AUTHOR="(C) 2013-2017 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=2.1-beta5 PROGRAM_VERSION=2.1-beta5
PROGRAM_BUILD=2018083003 PROGRAM_BUILD=2018083005
IS_STABLE=no IS_STABLE=no
#### Execution order #__WITH_PARANOIA_DEBUG #### Execution order #__WITH_PARANOIA_DEBUG
@ -4151,7 +4151,7 @@ function DecryptFiles {
function Rsync { function Rsync {
local sourceDir="${1}" # Source directory local sourceDir="${1}" # Source directory
local destinationDir="${2}" # Destination directory local destinationDir="${2}" # Destination directory
local recursive="${2:-true}" # Backup only files at toplevel of directory local recursive="${3:-true}" # Backup only files at toplevel of directory
__CheckArguments 3 $# "$@" #__WITH_PARANOIA_DEBUG __CheckArguments 3 $# "$@" #__WITH_PARANOIA_DEBUG
@ -4166,9 +4166,6 @@ function Rsync {
RSYNC_NO_RECURSE_ARGS="" RSYNC_NO_RECURSE_ARGS=""
fi fi
Logger "Beginning file backup of [$sourceDir] to [$destinationDir]." "VERBOSE"
# Creating subdirectories because rsync cannot handle multiple subdirectory creation # Creating subdirectories because rsync cannot handle multiple subdirectory creation
if [ "$BACKUP_TYPE" == "local" ]; then if [ "$BACKUP_TYPE" == "local" ]; then
_CreateDirectoryLocal "$destinationDir" _CreateDirectoryLocal "$destinationDir"
@ -4227,7 +4224,7 @@ function FilesBackup {
encryptDir="$FILE_STORAGE" encryptDir="$FILE_STORAGE"
fi fi
Logger "Beginning backup task [$backupTask]." "NOTICE" Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -4263,7 +4260,7 @@ function FilesBackup {
encryptDir="$FILE_STORAGE" encryptDir="$FILE_STORAGE"
fi fi
Logger "Beginning backup task [$backupTask]." "NOTICE" Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" false true EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" false true
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -4298,7 +4295,7 @@ function FilesBackup {
encryptDir="$FILE_STORAGE" encryptDir="$FILE_STORAGE"
fi fi
Logger "Beginning backup task [$backupTask]." "NOTICE" Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

13
obackup.sh
View File

@ -7,7 +7,7 @@ PROGRAM="obackup"
AUTHOR="(C) 2013-2017 by Orsiris de Jong" AUTHOR="(C) 2013-2017 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=2.1-beta5 PROGRAM_VERSION=2.1-beta5
PROGRAM_BUILD=2018083003 PROGRAM_BUILD=2018083005
IS_STABLE=no IS_STABLE=no
@ -3945,7 +3945,7 @@ function DecryptFiles {
function Rsync { function Rsync {
local sourceDir="${1}" # Source directory local sourceDir="${1}" # Source directory
local destinationDir="${2}" # Destination directory local destinationDir="${2}" # Destination directory
local recursive="${2:-true}" # Backup only files at toplevel of directory local recursive="${3:-true}" # Backup only files at toplevel of directory
local rsyncCmd local rsyncCmd
@ -3959,9 +3959,6 @@ function Rsync {
RSYNC_NO_RECURSE_ARGS="" RSYNC_NO_RECURSE_ARGS=""
fi fi
Logger "Beginning file backup of [$sourceDir] to [$destinationDir]." "VERBOSE"
# Creating subdirectories because rsync cannot handle multiple subdirectory creation # Creating subdirectories because rsync cannot handle multiple subdirectory creation
if [ "$BACKUP_TYPE" == "local" ]; then if [ "$BACKUP_TYPE" == "local" ]; then
_CreateDirectoryLocal "$destinationDir" _CreateDirectoryLocal "$destinationDir"
@ -4019,7 +4016,7 @@ function FilesBackup {
encryptDir="$FILE_STORAGE" encryptDir="$FILE_STORAGE"
fi fi
Logger "Beginning backup task [$backupTask]." "NOTICE" Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -4055,7 +4052,7 @@ function FilesBackup {
encryptDir="$FILE_STORAGE" encryptDir="$FILE_STORAGE"
fi fi
Logger "Beginning backup task [$backupTask]." "NOTICE" Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" false true EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" false true
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -4090,7 +4087,7 @@ function FilesBackup {
encryptDir="$FILE_STORAGE" encryptDir="$FILE_STORAGE"
fi fi
Logger "Beginning backup task [$backupTask]." "NOTICE" Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then