From cafa1347a454e68bb4f5800fa230b53bb0197382 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 2 Feb 2016 10:32:13 +0100 Subject: [PATCH] Fixed quicksync trying to check config file --- dev/debug_osync.sh | 12 +++++++----- dev/n_osync.sh | 8 +++++--- osync.sh | 12 +++++++----- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index 4801dba..61cbd25 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash PROGRAM="osync" # Rsync based two way sync engine with fault tolerance -AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" +AUTHOR="(L) 2013-2015 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.1-pre -PROGRAM_BUILD=2015122101 +PROGRAM_BUILD=2016020201 IS_STABLE=no -FUNC_BUILD=2015121503 +FUNC_BUILD=2015122101 ## 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 @@ -327,7 +327,7 @@ function SendAlert { fi # If function has not returned 0 yet, assume it's critical that no alert can be sent - Logger "/!\ CRITICAL: Cannot send alert" "ERROR" # Is not marked critical because execution must continue + Logger "/!\ CRITICAL: Cannot send alert (neither mutt, mail, sendmail nor sendemail found)." "ERROR" # Is not marked critical because execution must continue # Delete tmp log file if [ -f "$ALERT_LOG_FILE" ]; then @@ -2467,7 +2467,9 @@ opts="${opts# *}" PreInit Init PostInit - CheckCurrentConfig + if [ $_QUICK_SYNC -lt 2 ]; then + CheckCurrentConfig + fi GetRemoteOS InitRemoteOSSettings diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 3ef1927..551b304 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash PROGRAM="osync" # Rsync based two way sync engine with fault tolerance -AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" +AUTHOR="(L) 2013-2015 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.1-pre -PROGRAM_BUILD=2015122101 +PROGRAM_BUILD=2016020201 IS_STABLE=no source "./ofunctions.sh" @@ -1573,7 +1573,9 @@ opts="${opts# *}" PreInit Init PostInit - CheckCurrentConfig + if [ $_QUICK_SYNC -lt 2 ]; then + CheckCurrentConfig + fi GetRemoteOS InitRemoteOSSettings diff --git a/osync.sh b/osync.sh index 9991546..25b0119 100755 --- a/osync.sh +++ b/osync.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash PROGRAM="osync" # Rsync based two way sync engine with fault tolerance -AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" +AUTHOR="(L) 2013-2015 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.1-pre -PROGRAM_BUILD=2015122101 +PROGRAM_BUILD=2016020201 IS_STABLE=no -FUNC_BUILD=2015121503 +FUNC_BUILD=2015122101 ## 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 @@ -315,7 +315,7 @@ function SendAlert { fi # If function has not returned 0 yet, assume it's critical that no alert can be sent - Logger "/!\ CRITICAL: Cannot send alert" "ERROR" # Is not marked critical because execution must continue + Logger "/!\ CRITICAL: Cannot send alert (neither mutt, mail, sendmail nor sendemail found)." "ERROR" # Is not marked critical because execution must continue # Delete tmp log file if [ -f "$ALERT_LOG_FILE" ]; then @@ -2329,7 +2329,9 @@ opts="${opts# *}" PreInit Init PostInit - CheckCurrentConfig + if [ $_QUICK_SYNC -lt 2 ]; then + CheckCurrentConfig + fi GetRemoteOS InitRemoteOSSettings