mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removes usage of DOTNET_HOME in CLI repo.

Browse source 
DOTNET_HOME is no longer required, though it is a documented override, so this change removes all unnecessary references to DOTNET_HOME from the CLI Repo.
This commit is contained in:
Piotr Puszkiewicz 2016-02-18 13:05:12 -08:00
parent f81ba05a7c
commit e625cbcf7a
13 changed files with 7 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/common/_common.sh
View file

@ -18,7 +18,7 @@ export CHANNEL=$RELEASE_SUFFIX
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$RID
[ -z "$DOTNET_CLI_VERSION" ] && export DOTNET_CLI_VERSION=0.1.0.0
[ -z "$DOTNET_HOME" ] && export DOTNET_HOME=$STAGE2_DIR && export PATH=$STAGE2_DIR/bin:$PATH
[ -z "$DOTNET_ON_PATH" ] && export DOTNET_ON_PATH=$STAGE2_DIR && export PATH=$STAGE2_DIR/bin:$PATH
[ -z "$CONFIGURATION" ] && export CONFIGURATION=Debug
#TODO this is a workaround for a nuget bug on ubuntu. Remove

4
scripts/common/_utility.ps1
View file

@ -36,7 +36,7 @@ function setVarIfDefault([string]$varName, [string]$value)
function setPathAndHomeIfDefault([string]$rootPath)
{
If ($env:DOTNET_HOME -eq $null)
If ($env:DOTNET_ON_PATH -eq $null)
{
setPathAndHome $rootPath
}
@ -44,7 +44,7 @@ function setPathAndHomeIfDefault([string]$rootPath)
function setPathAndHome([string]$rootPath)
{
$env:DOTNET_HOME=$rootPath
$env:DOTNET_ON_PATH=$rootPath
$env:PATH="$rootPath\bin;$env:PATH"
}