From 61a70b1ba5b96456479dbe5cfbe9c65e65faa95c Mon Sep 17 00:00:00 2001 From: deajan Date: Thu, 19 Nov 2015 23:05:59 +0100 Subject: [PATCH] Fixed ofunctions.sh path --- dev/debug_obackup.sh | 4 ++-- dev/merge.sh | 2 +- dev/n_obackup.sh | 2 +- obackup.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index 89e91f5..d86fbf8 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -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 { # 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 diff --git a/dev/merge.sh b/dev/merge.sh index 2f96510..74bfd59 100755 --- a/dev/merge.sh +++ b/dev/merge.sh @@ -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 } diff --git a/dev/n_obackup.sh b/dev/n_obackup.sh index 4af5414..2e99a03 100755 --- a/dev/n_obackup.sh +++ b/dev/n_obackup.sh @@ -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" diff --git a/obackup.sh b/obackup.sh index f86679d..22702ed 100755 --- a/obackup.sh +++ b/obackup.sh @@ -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 { # 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