From e3c6ae3a40eff0b9e84e63e5eb81e7fc26c33d15 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 27 Dec 2016 12:52:59 +0100 Subject: [PATCH] Added global local os variables --- dev/ofunctions.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index fc35e97..be2287e 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -3,7 +3,7 @@ #### OFUNCTIONS MINI SUBSET #### _OFUNCTIONS_VERSION=2.1-RC1+dev -_OFUNCTIONS_BUILD=2016122303 +_OFUNCTIONS_BUILD=2016122701 #### _OFUNCTIONS_BOOTSTRAP SUBSET #### _OFUNCTIONS_BOOTSTRAP=true #### _OFUNCTIONS_BOOTSTRAP SUBSET END #### @@ -150,7 +150,7 @@ function RemoteLogger { local retval="${3:-undef}" # optional return value of command if [ "$_LOGGER_PREFIX" == "time" ]; then - prefix="RTIME: $SECONDS - " + prefix="TIME: $SECONDS - " elif [ "$_LOGGER_PREFIX" == "date" ]; then prefix="R $(date) - " else @@ -1098,7 +1098,7 @@ function GetLocalOS { if grep -i Microsoft /proc/sys/kernel/osrelease > /dev/null 2>&1; then localOsVar="Microsoft" else - localOsVar="$(uname -spio 2>&1)" + localOsVar="$(uname -spior 2>&1)" if [ $? != 0 ]; then localOsVar="$(uname -v 2>&1)" if [ $? != 0 ]; then @@ -1148,6 +1148,9 @@ function GetLocalOS { if [ "$_OFUNCTIONS_VERSION" != "" ]; then Logger "Local OS: [$localOsVar]." "DEBUG" fi + + # Add a global variable for statistics in installer + LOCAL_OS_FULL="$localOsVar" } #### GetLocalOS SUBSET END #### @@ -1175,7 +1178,7 @@ function GetOs { if grep -i Microsoft /proc/sys/kernel/osrelease > /dev/null 2>&1; then localOsVar="Microsoft" else - localOsVar="$(uname -spio 2>&1)" + localOsVar="$(uname -spior 2>&1)" if [ $? != 0 ]; then localOsVar="$(uname -v 2>&1)" if [ $? != 0 ]; then