diff --git a/src/Misc/layoutroot/env.sh b/src/Misc/layoutroot/env.sh index 0bf710038e..92b597f4f6 100755 --- a/src/Misc/layoutroot/env.sh +++ b/src/Misc/layoutroot/env.sh @@ -1,13 +1,13 @@ #!/bin/bash varCheckList=( - 'LANG' - 'JAVA_HOME' - 'ANT_HOME' - 'M2_HOME' - 'ANDROID_HOME' - 'GRADLE_HOME' - 'NVM_BIN' + 'LANG' + 'JAVA_HOME' + 'ANT_HOME' + 'M2_HOME' + 'ANDROID_HOME' + 'GRADLE_HOME' + 'NVM_BIN' 'NVM_PATH' 'VSTS_HTTP_PROXY' 'VSTS_HTTP_PROXY_USERNAME' @@ -17,6 +17,16 @@ varCheckList=( 'AGENT_TOOLSDIRECTORY' ) +# Allows the caller to specify additional vars on the commandline, for example: +# ./env.sh DOTNET_SYSTEM_GLOBALIZATION_INVARIANT DOTNET_ROOT +for arg in "$@" +do + if [[ ! " ${varCheckList[@]} " =~ " ${arg} " ]]; then + varCheckList+=($arg) + fi +done + + envContents="" if [ -f ".env" ]; then @@ -34,7 +44,7 @@ function writeVar() if [ ! -z "${!checkVar}" ]; then echo "${checkVar}=${!checkVar}">>.env fi - fi + fi } echo $PATH>.path