From 27a2b26473cf8ef6e96593df2ad471bff33508af Mon Sep 17 00:00:00 2001 From: deajan Date: Fri, 9 Jun 2017 11:50:10 +0200 Subject: [PATCH] Rebuilt targets --- dev/debug_obackup.sh | 8 +++++--- obackup.sh | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index 04f55d7..16ee95a 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -36,7 +36,7 @@ IS_STABLE=no _OFUNCTIONS_VERSION=2.1.4-rc1 -_OFUNCTIONS_BUILD=2017060901 +_OFUNCTIONS_BUILD=2017060903 _OFUNCTIONS_BOOTSTRAP=true ## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr @@ -428,9 +428,7 @@ function SendAlert { fi eval "cat \"$LOG_FILE\" $COMPRESSION_PROGRAM > $ALERT_LOG_FILE" - ALERT_LOG_FILE="$ALERT_LOG_FILE$COMPRESSION_EXTENSION" if [ $? != 0 ]; then - Logger "Cannot create [$ALERT_LOG_FILE]" "WARN" attachment=false else attachment=true @@ -1727,6 +1725,10 @@ function SetCompression { COMPRESSION_EXTENSION= fi fi + + if [ ".${ALERT_LOG_FILE##*.}" != "$COMPRESSION_EXTENSION" ]; then + ALERT_LOG_FILE="$ALERT_LOG_FILE$COMPRESSION_EXTENSION" + fi } function InitLocalOSDependingSettings { diff --git a/obackup.sh b/obackup.sh index 4605fe0..44c9f74 100755 --- a/obackup.sh +++ b/obackup.sh @@ -13,7 +13,7 @@ IS_STABLE=no _OFUNCTIONS_VERSION=2.1.4-rc1 -_OFUNCTIONS_BUILD=2017060901 +_OFUNCTIONS_BUILD=2017060903 _OFUNCTIONS_BOOTSTRAP=true ## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr @@ -387,9 +387,7 @@ function SendAlert { fi eval "cat \"$LOG_FILE\" $COMPRESSION_PROGRAM > $ALERT_LOG_FILE" - ALERT_LOG_FILE="$ALERT_LOG_FILE$COMPRESSION_EXTENSION" if [ $? != 0 ]; then - Logger "Cannot create [$ALERT_LOG_FILE]" "WARN" attachment=false else attachment=true @@ -1577,6 +1575,10 @@ function SetCompression { COMPRESSION_EXTENSION= fi fi + + if [ ".${ALERT_LOG_FILE##*.}" != "$COMPRESSION_EXTENSION" ]; then + ALERT_LOG_FILE="$ALERT_LOG_FILE$COMPRESSION_EXTENSION" + fi } function InitLocalOSDependingSettings {