From 3560360e70997d7a658e8cb368e0aa62e4564e99 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 31 Jan 2019 23:35:18 -0600 Subject: [PATCH] update --- default.inc | 20 ++++++++++---------- test.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/default.inc b/default.inc index 280a4cb..a0e37fe 100755 --- a/default.inc +++ b/default.inc @@ -60,8 +60,8 @@ redhat_derivative () { } detect_os () { - local -n myresult="$1" || return 1 - echo MACH=`uname -m` + local -n __resultvar="$1" || return 1 + __resultvar[MACH]=`uname -m` if [ -f /etc/redhat-release ] ; then echo DISTRIBUTION=redhat echo FAMILY=rh @@ -88,16 +88,16 @@ detect_os () { echo REV=`cat /etc/mandrake-release | sed s/.*release\ // | sed s/\ .*//` echo FAMILY=rh elif [ -f /etc/debian_version ] ; then - echo DISTRIBUTION=debian - echo FAMILY=debian + __resultvar[DISTRIBUTION]=debian + __resultvar[FAMILY]=debian if which lsb_release 2>&1 > /dev/null ; then - echo DERIVATIVE=`lsb_release --id --short 2> /dev/null` - echo RELEASE=`lsb_release --release --short 2> /dev/null` - echo CODENAME=`lsb_release --codename --short 2> /dev/null` + __resultvar[DERIVATIVE]=`lsb_release --id --short 2> /dev/null` + __resultvar[RELEASE]=`lsb_release --release --short 2> /dev/null` + __resultvar[CODENAME]=`lsb_release --codename --short 2> /dev/null` else - echo DERIVATIVE=unknown - echo RELEASE=`cat /etc/debian_version` - echo CODENAME=unknown + __resultvar[DERIVATIVE]=unknown + __resultvar[RELEASE]=`cat /etc/debian_version` + __resultvar[CODENAME]=unknown fi elif [ -f /etc/UnitedLinux-release ]; then echo DISTRIBUTION="united" diff --git a/test.sh b/test.sh index de8965a..88219fb 100755 --- a/test.sh +++ b/test.sh @@ -20,4 +20,4 @@ fi detect_os OS -echo $OS \ No newline at end of file +declare -p $OS \ No newline at end of file