diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index cdf9082..e5b4eaf 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -4,10 +4,10 @@ #Check dryruns with nosuffix mode for timestampList PROGRAM="osync" # Rsync based two way sync engine with fault tolerance -AUTHOR="(C) 2013-2020 by Orsiris de Jong" +AUTHOR="(C) 2013-2021 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.3.0-rc1 -PROGRAM_BUILD=2020111501 +PROGRAM_BUILD=2021062901 IS_STABLE=false CONFIG_FILE_REVISION_REQUIRED=1.3.0 @@ -2493,6 +2493,10 @@ function TrapQuit { UnlockReplicas RunAfterHook Logger "$PROGRAM finished." "ALWAYS" + if [ $ALWAYS_SEND_MAILS == true ]; + then + SendAlert + fi exitcode=0 fi CleanUp @@ -6676,6 +6680,11 @@ if [ $_QUICK_SYNC -eq 2 ]; then if [ $(IsInteger "$MIN_WAIT") -ne 1 ]; then MIN_WAIT=30 fi + + if [ "$ALWAYS_SEND_MAILS" == "" ]; then + ALWAYS_SEND_MAILS=false + fi + # First character shouldn't be '-' when config file given elif [ "${1:0:1}" != "-" ]; then ConfigFile="${1}" diff --git a/install.sh b/install.sh index 2bd31b3..325b745 100755 --- a/install.sh +++ b/install.sh @@ -10,7 +10,7 @@ PROGRAM_BINARY=$PROGRAM".sh" PROGRAM_BATCH=$PROGRAM"-batch.sh" SSH_FILTER="ssh_filter.sh" -SCRIPT_BUILD=2020042901 +SCRIPT_BUILD=2020112901 INSTANCE_ID="installer-$SCRIPT_BUILD" ## osync / obackup / pmocr / zsnap install script @@ -849,14 +849,14 @@ function CopyServiceFiles { } function Statistics { - if type wget > /dev/null; then + if type wget > /dev/null 2>&1; then wget -qO- "$STATS_LINK" > /dev/null 2>&1 if [ $? == 0 ]; then return 0 fi fi - if type curl > /dev/null; then + if type curl > /dev/null 2>&1; then curl "$STATS_LINK" -o /dev/null > /dev/null 2>&1 if [ $? == 0 ]; then return 0 diff --git a/osync.sh b/osync.sh index 0480bf0..e780b61 100755 --- a/osync.sh +++ b/osync.sh @@ -4,10 +4,10 @@ #Check dryruns with nosuffix mode for timestampList PROGRAM="osync" # Rsync based two way sync engine with fault tolerance -AUTHOR="(C) 2013-2020 by Orsiris de Jong" +AUTHOR="(C) 2013-2021 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.3.0-rc1 -PROGRAM_BUILD=2020111501 +PROGRAM_BUILD=2021062901 IS_STABLE=false CONFIG_FILE_REVISION_REQUIRED=1.3.0 @@ -2344,6 +2344,10 @@ function TrapQuit { UnlockReplicas RunAfterHook Logger "$PROGRAM finished." "ALWAYS" + if [ $ALWAYS_SEND_MAILS == true ]; + then + SendAlert + fi exitcode=0 fi CleanUp @@ -6434,6 +6438,11 @@ if [ $_QUICK_SYNC -eq 2 ]; then if [ $(IsInteger "$MIN_WAIT") -ne 1 ]; then MIN_WAIT=30 fi + + if [ "$ALWAYS_SEND_MAILS" == "" ]; then + ALWAYS_SEND_MAILS=false + fi + # First character shouldn't be '-' when config file given elif [ "${1:0:1}" != "-" ]; then ConfigFile="${1}"