From 8a57b568e9fb30560fc1fb84af38434dd531e655 Mon Sep 17 00:00:00 2001 From: deajan Date: Fri, 15 Mar 2019 12:09:40 +0100 Subject: [PATCH] Improved version check --- dev/ofunctions.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index 06914a2..1ce5a69 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -31,7 +31,7 @@ #### OFUNCTIONS MINI SUBSET #### #### OFUNCTIONS MICRO SUBSET #### _OFUNCTIONS_VERSION=2.3.0-RC2 -_OFUNCTIONS_BUILD=2019031501 +_OFUNCTIONS_BUILD=2019031502 #### _OFUNCTIONS_BOOTSTRAP SUBSET #### _OFUNCTIONS_BOOTSTRAP=true #### _OFUNCTIONS_BOOTSTRAP SUBSET END #### @@ -745,8 +745,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