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

Fixed ofunctions.sh path

This commit is contained in:
deajan 2015-11-19 23:05:59 +01:00
parent 4b2b99d016
commit 61a70b1ba5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/debug_obackup.sh
View File

@ -9,7 +9,7 @@ PROGRAM_VERSION=2.0-pre
PROGRAM_BUILD=2015111901
IS_STABLE=no
FUNC_BUILD=2015111601
FUNC_BUILD=2015111901
## BEGIN Generic functions for osync & obackup written in 2013-2015 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
@ -260,7 +260,7 @@ function SendAlert {
# </OSYNC SPECIFIC>
eval "cat \"$LOG_FILE\" $COMPRESSION_PROGRAM > $ALERT_LOG_FILE"
MAIL_ALERT_MSG="$MAIL_ALERT_MSG"$'\n\n'$(tail -n 25 "$LOG_FILE")
MAIL_ALERT_MSG="$MAIL_ALERT_MSG"$'\n\n'$(tail -n 50 "$LOG_FILE")
if [ $ERROR_ALERT -eq 1 ]; then
subject="Error alert for $INSTANCE_ID"
elif [ $WARN_ALERT -eq 1 ]; then

2
dev/merge.sh
View File

@ -15,7 +15,7 @@ function Unexpand {
function Merge {
sed "/source \"\/home\/git\/common\/ofunctions.sh\"/r /home/git/common/ofunctions.sh" tmp_$PROGRAM.sh | grep -v 'source "/home/git/common/ofunctions.sh"' > debug_$PROGRAM.sh
sed "/source \"\.\/ofunctions.sh\"/r /home/git/common/ofunctions.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' > debug_$PROGRAM.sh
chmod +x debug_$PROGRAM.sh
}

2
dev/n_obackup.sh
View File

@ -9,7 +9,7 @@ PROGRAM_VERSION=2.0-pre
PROGRAM_BUILD=2015111901
IS_STABLE=no
source "/home/git/common/ofunctions.sh"
source "./ofunctions.sh"
## Working directory for partial downloads
PARTIAL_DIR=".obackup_workdir_partial"

4
obackup.sh
View File

@ -9,7 +9,7 @@ PROGRAM_VERSION=2.0-pre
PROGRAM_BUILD=2015111901
IS_STABLE=no
FUNC_BUILD=2015111601
FUNC_BUILD=2015111901
## BEGIN Generic functions for osync & obackup written in 2013-2015 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
@ -248,7 +248,7 @@ function SendAlert {
# </OSYNC SPECIFIC>
eval "cat \"$LOG_FILE\" $COMPRESSION_PROGRAM > $ALERT_LOG_FILE"
MAIL_ALERT_MSG="$MAIL_ALERT_MSG"$'\n\n'$(tail -n 25 "$LOG_FILE")
MAIL_ALERT_MSG="$MAIL_ALERT_MSG"$'\n\n'$(tail -n 50 "$LOG_FILE")
if [ $ERROR_ALERT -eq 1 ]; then
subject="Error alert for $INSTANCE_ID"
elif [ $WARN_ALERT -eq 1 ]; then