Changeset 66800 in vbox for trunk/src/VBox/ValidationKit/testboxscript/linux

Timestamp:

May 4, 2017 11:55:34 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115217

Message:

testboxscript: modified the setup to no save default values and tricked setup.sh to replace solserv with the new names.

File:

• trunk/src/VBox/ValidationKit/testboxscript/linux/setup-routines.sh (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testboxscript/linux/setup-routines.sh

@@ -6 +6 @@
 
 #
-# Copyright (C) 2006-2015 Oracle Corporation
+# Copyright (C) 2006-2017 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -60 +60 @@
 
     #
-    # Work around a bug with arrays in old bash versions.
-    #
-    if [ ${#TESTBOXSCRIPT_ENVVARS[@]} -eq 0 ]; then
-        unset TESTBOXSCRIPT_ENVVARS
-    fi
-
-    #
     # Install the configuration file.
     #
-    echo "# Generated by $0."            >  "${MY_CONFIG_FILE}"
-    set | sed -n -e '/^TESTBOXSCRIPT_/p' >> "${MY_CONFIG_FILE}"
+    echo "# Generated by $0." >  "${MY_CONFIG_FILE}"
+    for var in ${TESTBOXSCRIPT_CFG_NAMES};
+    do
+        varcfg=TESTBOXSCRIPT_${var}
+        vardef=TESTBOXSCRIPT_DEFAULT_${var}
+        if [ "${!varcfg}" = "${!vardef}" ]; then
+            echo "# using default value: ${varcfg}=${!varcfg}" >> "${MY_CONFIG_FILE}"
+        else
+            echo "${varcfg}=${!varcfg}" >> "${MY_CONFIG_FILE}"
+        fi
+    done
+
+    # Work around a bug with arrays in old bash versions.
+    if [ ${#TESTBOXSCRIPT_ENVVARS[@]} -ne 0 ]; then
+        set | sed -n -e '/^TESTBOXSCRIPT_ENVVARS=/p' >> "${MY_CONFIG_FILE}"
+    fi
     return 0;
 }