diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index 1734a00b7..b04700258 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -3,11 +3,11 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" -PROGRAM_VERSION=1.1.3 +PROGRAM_VERSION=1.1.4 PROGRAM_BUILD=2016090201 IS_STABLE=yes -## FUNC_BUILD=2016071902-c +## FUNC_BUILD=2016071902-d ## 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 @@ -80,7 +80,7 @@ fi # Default alert attachment filename -ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.last.log" +ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.$$.last.log" # Set error exit code if a piped command fails set -o pipefail @@ -351,7 +351,7 @@ function SendAlert { # Delete tmp log file if [ -f "$ALERT_LOG_FILE" ]; then - rm "$ALERT_LOG_FILE" + rm -f "$ALERT_LOG_FILE" fi } @@ -386,7 +386,7 @@ function SendEmail { local auth_string= if [ ! -f "$attachment" ]; then - attachment_command="-a $ALERT_LOG_FILE" + attachment_command="-a $attachment" mail_no_attachment=1 else mail_no_attachment=0 diff --git a/install.sh b/install.sh index 6826a7393..d3c8e6390 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash PROGRAM=osync -PROGRAM_VERSION=1.1.3 +PROGRAM_VERSION=1.1.4 PROGRAM_BINARY=$PROGRAM".sh" PROGRAM_BATCH=$PROGRAM"-batch.sh" SCRIPT_BUILD=2016082902 diff --git a/osync.sh b/osync.sh index d51c610f5..42327b52f 100755 --- a/osync.sh +++ b/osync.sh @@ -3,11 +3,11 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" -PROGRAM_VERSION=1.1.3 +PROGRAM_VERSION=1.1.4 PROGRAM_BUILD=2016090201 IS_STABLE=yes -## FUNC_BUILD=2016071902-c +## FUNC_BUILD=2016071902-d ## 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 @@ -76,7 +76,7 @@ fi # Default alert attachment filename -ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.last.log" +ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.$$.last.log" # Set error exit code if a piped command fails set -o pipefail @@ -339,7 +339,7 @@ function SendAlert { # Delete tmp log file if [ -f "$ALERT_LOG_FILE" ]; then - rm "$ALERT_LOG_FILE" + rm -f "$ALERT_LOG_FILE" fi } @@ -373,7 +373,7 @@ function SendEmail { local auth_string= if [ ! -f "$attachment" ]; then - attachment_command="-a $ALERT_LOG_FILE" + attachment_command="-a $attachment" mail_no_attachment=1 else mail_no_attachment=0