diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index 4881931..ded1c6b 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2019 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.3.0-pre-rc1 -PROGRAM_BUILD=2019012801 +PROGRAM_BUILD=2019031501 IS_STABLE=false CONFIG_FILE_REVISION_REQUIRED=1.3.0 @@ -43,7 +43,7 @@ CONFIG_FILE_REVISION_REQUIRED=1.3.0 # CleanUp no #__WITH_PARANOIA_DEBUG _OFUNCTIONS_VERSION=2.3.0-RC2 -_OFUNCTIONS_BUILD=2019031501 +_OFUNCTIONS_BUILD=2019031502 _OFUNCTIONS_BOOTSTRAP=true if ! type "$BASH" > /dev/null; then @@ -738,8 +738,9 @@ function LoadConfigFile { Logger "Wrong configuration file supplied [$configFile]. Cannot start." "CRITICAL" exit 1 else - revisionPresent=$(GetConfFileValue "$configFile" "CONFIG_FILE_REVISION" true) - if [ "$(IsNumeric $revisionPresent)" -eq 0 ]; then + revisionPresent="$(GetConfFileValue "$configFile" "CONFIG_FILE_REVISION" true)" + if [ "$(IsNumeric "${revisionPresent%%.*}")" -eq 0 ]; then + Logger "Missing CONFIG_FILE_REVISION. Please provide a valid config file, or run the config update script." "WARN" Logger "CONFIG_FILE_REVISION does not seem numeric [$revisionPresent]." "DEBUG" elif [ "$revisionRequired" != "" ]; then if [ $(VerComp "$revisionPresent" "$revisionRequired") -eq 2 ]; then diff --git a/install.sh b/install.sh index ce3b47c..aa639f1 100755 --- a/install.sh +++ b/install.sh @@ -18,7 +18,7 @@ INSTANCE_ID="installer-$SCRIPT_BUILD" ## Please adapt this to fit your distro needs _OFUNCTIONS_VERSION=2.3.0-RC2 -_OFUNCTIONS_BUILD=2019031501 +_OFUNCTIONS_BUILD=2019031502 _OFUNCTIONS_BOOTSTRAP=true if ! type "$BASH" > /dev/null; then diff --git a/osync.sh b/osync.sh index 56d2085..52e6f7c 100755 --- a/osync.sh +++ b/osync.sh @@ -7,14 +7,14 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2019 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.3.0-pre-rc1 -PROGRAM_BUILD=2019012801 +PROGRAM_BUILD=2019031501 IS_STABLE=false CONFIG_FILE_REVISION_REQUIRED=1.3.0 _OFUNCTIONS_VERSION=2.3.0-RC2 -_OFUNCTIONS_BUILD=2019031501 +_OFUNCTIONS_BUILD=2019031502 _OFUNCTIONS_BOOTSTRAP=true if ! type "$BASH" > /dev/null; then @@ -690,8 +690,9 @@ function LoadConfigFile { Logger "Wrong configuration file supplied [$configFile]. Cannot start." "CRITICAL" exit 1 else - revisionPresent=$(GetConfFileValue "$configFile" "CONFIG_FILE_REVISION" true) - if [ "$(IsNumeric $revisionPresent)" -eq 0 ]; then + revisionPresent="$(GetConfFileValue "$configFile" "CONFIG_FILE_REVISION" true)" + if [ "$(IsNumeric "${revisionPresent%%.*}")" -eq 0 ]; then + Logger "Missing CONFIG_FILE_REVISION. Please provide a valid config file, or run the config update script." "WARN" Logger "CONFIG_FILE_REVISION does not seem numeric [$revisionPresent]." "DEBUG" elif [ "$revisionRequired" != "" ]; then if [ $(VerComp "$revisionPresent" "$revisionRequired") -eq 2 ]; then