|
|
@ -41,7 +41,7 @@ IS_STABLE=yes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_OFUNCTIONS_VERSION=2.1.4-rc1
|
|
|
|
_OFUNCTIONS_VERSION=2.1.4-rc1
|
|
|
|
_OFUNCTIONS_BUILD=2017060801
|
|
|
|
_OFUNCTIONS_BUILD=2017092201
|
|
|
|
_OFUNCTIONS_BOOTSTRAP=true
|
|
|
|
_OFUNCTIONS_BOOTSTRAP=true
|
|
|
|
|
|
|
|
|
|
|
|
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
|
|
|
|
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
|
|
|
@ -1218,7 +1218,7 @@ function GetLocalOS {
|
|
|
|
# Get linux versions
|
|
|
|
# Get linux versions
|
|
|
|
if [ -f "/etc/os-release" ]; then
|
|
|
|
if [ -f "/etc/os-release" ]; then
|
|
|
|
localOsName=$(GetConfFileValue "/etc/os-release" "NAME")
|
|
|
|
localOsName=$(GetConfFileValue "/etc/os-release" "NAME")
|
|
|
|
localOsVer=$(GetConfFileValue "/etc/os-release" "VERSION")
|
|
|
|
localOsVer=$(GetConfFileValue "/etc/os-release" "VERSION" true)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# Add a global variable for statistics in installer
|
|
|
|
# Add a global variable for statistics in installer
|
|
|
@ -1940,6 +1940,7 @@ function VerComp () {
|
|
|
|
function GetConfFileValue () {
|
|
|
|
function GetConfFileValue () {
|
|
|
|
local file="${1}"
|
|
|
|
local file="${1}"
|
|
|
|
local name="${2}"
|
|
|
|
local name="${2}"
|
|
|
|
|
|
|
|
local noError="${3:-false}"
|
|
|
|
local value
|
|
|
|
local value
|
|
|
|
|
|
|
|
|
|
|
|
value=$(grep "^$name=" "$file")
|
|
|
|
value=$(grep "^$name=" "$file")
|
|
|
@ -1947,7 +1948,11 @@ function GetConfFileValue () {
|
|
|
|
value="${value##*=}"
|
|
|
|
value="${value##*=}"
|
|
|
|
echo "$value"
|
|
|
|
echo "$value"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
Logger "Cannot get value for [$name] in config file [$file]." "ERROR"
|
|
|
|
if [ $noError == true ]; then
|
|
|
|
|
|
|
|
Logger "Cannot get value for [$name] in config file [$file]." "NOTICE"
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
Logger "Cannot get value for [$name] in config file [$file]." "ERROR"
|
|
|
|
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|