儲存庫 vbox 的更動 66805

時間撮記:

2017-5-5 上午09:27:08 (8 年 以前)

作者:

vboxsync

訊息:

testboxscript/setup.sh: bash on solaris 10 doesn't grok += array syntax. improved envvar handling

檔案:

• trunk/src/VBox/ValidationKit/testboxscript/setup.sh (修改) (1 筆差異)

trunk/src/VBox/ValidationKit/testboxscript/setup.sh

@@ -367 +367 @@
             "--testrsrc-server-passwd") TESTBOXSCRIPT_TESTRSRC_PASSWD="$2"; shift;;
             "--putenv")
-                ## @todo remove any existing variable or we'll end up with a pretty long number of putenv statements on solaris.
-                TESTBOXSCRIPT_ENVVARS+=("$2");
+                MY_FOUND=no
+                MY_VAR=`echo $2 | sed -e 's/=.*$//' `
+                for i in ${!TESTBOXSCRIPT_ENVVARS[@]};
+                do
+                    MY_CURVAR=`echo "${TESTBOXSCRIPT_ENVVARS[i]}" | sed -e 's/=.*$//' `
+                    if [ -n "${MY_CURVAR}" -a  "${MY_CURVAR}" = "${MY_VAR}" ]; then
+                        TESTBOXSCRIPT_ENVVARS[$i]="$2"
+                        MY_FOUND=yes
+                    fi
+                done
+                if [ "${MY_FOUND}" = "no" ]; then
+                    TESTBOXSCRIPT_ENVVARS=( "${TESTBOXSCRIPT_ENVVARS[@]}" "$2" );
+                fi
                 shift;;
             --*)