Skip to content

Commit

Permalink
Bootstrap needs cli subdirectory to exist (dotnet#1226)
Browse files Browse the repository at this point in the history
* Bootstrap needs cli subdirectory to exist

* Fix shell script as well
  • Loading branch information
JeremyKuhne authored Nov 15, 2016
1 parent 3ed0bf6 commit 2872add
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions bootstrap/bootstrap.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/script
$rootCliVersion = Join-Path $RepositoryRoot ".cliversion"
$dotNetCliVersion = Get-Content $rootCliVersion

if (-Not (Test-Path $CliLocalPath))
{
mkdir $CliLocalPath | Out-Null
}

# now execute the script
Write-Host "$dotnetInstallPath -Version $dotNetCliVersion -InstallDir $CliLocalPath -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Version $dotNetCliVersion -InstallDir $CliLocalPath -Architecture ""$Architecture"""
Expand Down
4 changes: 4 additions & 0 deletions bootstrap/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ if [ $forcedCliLocalPath = "<none>" ]; then
rootCliVersion="$repoRoot/.cliversion"
dotNetCliVersion=`cat $rootCliVersion`

if [ ! -e $cliLocalPath ]; then
mkdir -p "$cliLocalPath"
fi

# now execute the script
say_verbose "installing CLI: $dotnetInstallPath --version \"$dotNetCliVersion\" --install-dir $cliLocalPath --architecture \"$architecture\""
$dotnetInstallPath --version "$dotNetCliVersion" --install-dir $cliLocalPath --architecture "$architecture"
Expand Down

0 comments on commit 2872add

Please sign in to comment.