Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow env.sh to accept additional env var names #3339

Merged
merged 4 commits into from
Dec 12, 2022
Merged

Allow env.sh to accept additional env var names #3339

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da7c3c1
Allow env.sh to accept additional env var names
ricksbrown Mar 22, 2021
a31d412
Merge branch 'master' into feature/extend-env
KonstantinTyukalov Dec 1, 2022
19ee4be
Merge branch 'master' into feature/extend-env
kirill-ivlev Dec 1, 2022
8a7db10
Merge branch 'master' into feature/extend-env
KonstantinTyukalov Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/Misc/layoutroot/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
Expand All @@ -34,7 +44,7 @@ function writeVar()
if [ ! -z "${!checkVar}" ]; then
echo "${checkVar}=${!checkVar}">>.env
fi
fi
fi
}

echo $PATH>.path
Expand Down