Linux
/
obackup
mirror of https://github.com/deajan/obackup.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed wrong variable names

This commit is contained in:
deajan 2016-08-08 00:03:19 +02:00
parent cc5a2a4fd1
commit dbe0020c85
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dev/n_obackup.sh
View File

@ -1,11 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#TODO: rework old IFS= statements
###### Remote push/pull (or local) backup script for files & databases ###### Remote push/pull (or local) backup script for files & databases
PROGRAM="obackup" PROGRAM="obackup"
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 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-dev PROGRAM_VERSION=2.1-dev
PROGRAM_BUILD=2016080701 PROGRAM_BUILD=2016080702
IS_STABLE=yes IS_STABLE=yes
source "./ofunctions.sh" source "./ofunctions.sh"
@ -946,9 +949,9 @@ function FilesBackup {
#do #do
Logger "Beginning file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning file backup of [$BACKUP_TASK]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "recurse" Duplicity "$backupTask" "recurse"
else else
Rsync "$BACKUP_TASK" "recurse" Rsync "$backupTask" "recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -961,9 +964,9 @@ function FilesBackup {
#do #do
Logger "Beginning non recursive file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning non recursive file backup of [$BACKUP_TASK]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "no-recurse" Duplicity "$backupTask" "no-recurse"
else else
Rsync "$BACKUP_TASK" "no-recurse" Rsync "$backupTask" "no-recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done
@ -976,9 +979,9 @@ function FilesBackup {
#do #do
Logger "Beginning recursive file backup of [$BACKUP_TASK]." "NOTICE" Logger "Beginning recursive file backup of [$BACKUP_TASK]." "NOTICE"
if [ "$ENCRYPTION" == "yes" ]; then if [ "$ENCRYPTION" == "yes" ]; then
Duplicity "$BACKUP_TASK" "recurse" Duplicity "$backupTask" "recurse"
else else
Rsync "$BACKUP_TASK" "recurse" Rsync "$backupTask" "recurse"
fi fi
CheckTotalExecutionTime CheckTotalExecutionTime
done done

4
dev/ofunctions.sh
View File

@ -1,6 +1,6 @@
#### MINIMAL-FUNCTION-SET BEGIN #### #### MINIMAL-FUNCTION-SET BEGIN ####
## FUNC_BUILD=2016080701 ## FUNC_BUILD=2016080702
## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
#TODO: set _LOGGER_PREFIX in other apps, specially for osync daemon mode #TODO: set _LOGGER_PREFIX in other apps, specially for osync daemon mode
@ -572,7 +572,7 @@ function WaitForTaskCompletion {
local counting="{6:-true}" # Count time since function launch if true, script launch if false local counting="{6:-true}" # Count time since function launch if true, script launch if false
Logger "${FUNCNAME[0]} called by [$caller_name]." "PARANOIA_DEBUG" #__WITH_PARANOIA_DEBUG Logger "${FUNCNAME[0]} called by [$caller_name]." "PARANOIA_DEBUG" #__WITH_PARANOIA_DEBUG
__CheckArguments 5 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG __CheckArguments 6 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG
local soft_alert=0 # Does a soft alert need to be triggered, if yes, send an alert once local soft_alert=0 # Does a soft alert need to be triggered, if yes, send an alert once
local log_ttime=0 # local time instance for comparaison local log_ttime=0 # local time instance for comparaison