dapr
/
cli
mirror of https://github.com/dapr/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support path that contains spaces (#514) 

Executing Install.ps1 will fail when DaprRoot contains spaces
This commit is contained in:
Van Tian 2020-11-14 02:00:01 +08:00 committed by GitHub
parent e58eaa9f41
commit 3c0ec02a16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
install/install.ps1
View File

@ -8,23 +8,27 @@ param (
$ErrorActionPreference = 'stop'
#Escape space of DapRoot path
$DaprRoot = $DaprRoot -replace ' ', '` '
# Constants
$DaprCliFileName = "dapr.exe"
$DaprCliFilePath = "${DaprRoot}\${DaprCliFileName}"
# GitHub Org and repo hosting Dapr CLI
$GitHubOrg="dapr"
$GitHubRepo="cli"
$GitHubOrg = "dapr"
$GitHubRepo = "cli"
# Set Github request authentication for basic authentication.
if ($Env:GITHUB_USER) {
$basicAuth = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($Env:GITHUB_USER + ":" + $Env:GITHUB_TOKEN));
$githubHeader = @{"Authorization"="Basic $basicAuth"}
} else {
$githubHeader = @{"Authorization" = "Basic $basicAuth" }
}
else {
$githubHeader = @{}
}
if((Get-ExecutionPolicy) -gt 'RemoteSigned' -or (Get-ExecutionPolicy) -eq 'ByPass') {
if ((Get-ExecutionPolicy) -gt 'RemoteSigned' -or (Get-ExecutionPolicy) -eq 'ByPass') {
Write-Output "PowerShell requires an execution policy of 'RemoteSigned'."
Write-Output "To make this change please run:"
Write-Output "'Set-ExecutionPolicy RemoteSigned -scope CurrentUser'"
@ -39,7 +43,8 @@ if (Test-Path $DaprCliFilePath -PathType Leaf) {
Write-Warning "Dapr is detected - $DaprCliFilePath"
Invoke-Expression "$DaprCliFilePath --version"
Write-Output "Reinstalling Dapr..."
} else {
}
else {
Write-Output "Installing Dapr..."
}
@ -57,7 +62,7 @@ if ($releases.Count -eq 0) {
}
# Filter windows binary and download archive
$windowsAsset = $releases | Where-Object { $_.tag_name -notlike "*rc*"} | Select-Object -First 1 | Select-Object -ExpandProperty assets | Where-Object { $_.name -Like "*windows_amd64.zip" }
$windowsAsset = $releases | Where-Object { $_.tag_name -notlike "*rc*" } | Select-Object -First 1 | Select-Object -ExpandProperty assets | Where-Object { $_.name -Like "*windows_amd64.zip" }
if (!$windowsAsset) {
throw "Cannot find the windows Dapr CLI binary"
}
@ -88,9 +93,10 @@ Remove-Item $zipFilePath -Force
# Add DaprRoot directory to User Path environment variable
Write-Output "Try to add $DaprRoot to User Path Environment variable..."
$UserPathEnvionmentVar = [Environment]::GetEnvironmentVariable("PATH", "User")
if($UserPathEnvionmentVar -like '*dapr*') {
if ($UserPathEnvionmentVar -like '*dapr*') {
Write-Output "Skipping to add $DaprRoot to User Path - $UserPathEnvionmentVar"
} else {
}
else {
[System.Environment]::SetEnvironmentVariable("PATH", $UserPathEnvionmentVar + ";$DaprRoot", "User")
$UserPathEnvionmentVar = [Environment]::GetEnvironmentVariable("PATH", "User")
Write-Output "Added $DaprRoot to User Path - $UserPathEnvionmentVar"