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

Rebuild after osync fix #52

Browse Source
This commit is contained in:
deajan 2016-07-19 10:53:55 +02:00
parent 2488f9f654
commit f2d121f38f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/debug_obackup.sh
View File

@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-RC1
PROGRAM_BUILD=2016052601 PROGRAM_BUILD=2016052601
IS_STABLE=yes IS_STABLE=yes
## FUNC_BUILD=2016052602 ## FUNC_BUILD=2016071901
## 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
## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@ -364,7 +364,7 @@ function SendAlert {
# smtp_server.domain.tld is mandatory, as is smtp_port (should be 25, 465 or 587) # smtp_server.domain.tld is mandatory, as is smtp_port (should be 25, 465 or 587)
# encryption can be set to tls, ssl or none # encryption can be set to tls, ssl or none
# smtp_user and smtp_password are optional # smtp_user and smtp_password are optional
# SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file" "sender_email@example.com" "smtp_server.domain.tld" "smtp_port" "encrpytion" "smtp_user" "smtp_password" # SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file" "sender_email@example.com" "smtp_server.domain.tld" "smtp_port" "encryption" "smtp_user" "smtp_password"
function SendEmail { function SendEmail {
local subject="${1}" local subject="${1}"
local message="${2}" local message="${2}"
@ -373,7 +373,7 @@ function SendEmail {
local sender_email="${5}" local sender_email="${5}"
local smtp_server="${6}" local smtp_server="${6}"
local smtp_port="${7}" local smtp_port="${7}"
local encrpytion="${8}" local encryption="${8}"
local smtp_user="${9}" local smtp_user="${9}"
local smtp_password="${10}" local smtp_password="${10}"
@ -789,7 +789,7 @@ function WaitForCompletion {
__CheckArguments 4 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG __CheckArguments 4 $# ${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_time=0 # local time instance for comparaison
local seconds_begin=$SECONDS # Seconds since the beginning of the script local seconds_begin=$SECONDS # Seconds since the beginning of the script
local exec_time=0 # Seconds since the beginning of this function local exec_time=0 # Seconds since the beginning of this function

8
obackup.sh
View File

@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-RC1
PROGRAM_BUILD=2016052601 PROGRAM_BUILD=2016052601
IS_STABLE=yes IS_STABLE=yes
## FUNC_BUILD=2016052602 ## FUNC_BUILD=2016071901
## 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
## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@ -352,7 +352,7 @@ function SendAlert {
# smtp_server.domain.tld is mandatory, as is smtp_port (should be 25, 465 or 587) # smtp_server.domain.tld is mandatory, as is smtp_port (should be 25, 465 or 587)
# encryption can be set to tls, ssl or none # encryption can be set to tls, ssl or none
# smtp_user and smtp_password are optional # smtp_user and smtp_password are optional
# SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file" "sender_email@example.com" "smtp_server.domain.tld" "smtp_port" "encrpytion" "smtp_user" "smtp_password" # SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file" "sender_email@example.com" "smtp_server.domain.tld" "smtp_port" "encryption" "smtp_user" "smtp_password"
function SendEmail { function SendEmail {
local subject="${1}" local subject="${1}"
local message="${2}" local message="${2}"
@ -361,7 +361,7 @@ function SendEmail {
local sender_email="${5}" local sender_email="${5}"
local smtp_server="${6}" local smtp_server="${6}"
local smtp_port="${7}" local smtp_port="${7}"
local encrpytion="${8}" local encryption="${8}"
local smtp_user="${9}" local smtp_user="${9}"
local smtp_password="${10}" local smtp_password="${10}"
@ -767,7 +767,7 @@ function WaitForCompletion {
local caller_name="${4}" # Who called this function local caller_name="${4}" # Who called this function
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_time=0 # local time instance for comparaison
local seconds_begin=$SECONDS # Seconds since the beginning of the script local seconds_begin=$SECONDS # Seconds since the beginning of the script
local exec_time=0 # Seconds since the beginning of this function local exec_time=0 # Seconds since the beginning of this function