Skip to content

Commit

Permalink
Merge pull request #2222 from Azure/bugfix/path-spaces
Browse files Browse the repository at this point in the history
Windows install scripts support paths with spaces
  • Loading branch information
gingi authored Oct 1, 2020
2 parents bf4970e + 0404362 commit f6f09e0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion scripts/install/install-windows.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
PowerShell.exe -ExecutionPolicy Bypass -Command "%~dp0\install-windows.ps1 %*"
PowerShell.exe -ExecutionPolicy Bypass -Command "& '%~dp0/install-windows.ps1' %*"
14 changes: 7 additions & 7 deletions scripts/install/install-windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ function confirm-branch() {
function confirm-latest-commit() {
git fetch

$local_commit = [string](git rev-parse HEAD)
$remote_commit = [string](git rev-parse "@{u}")
$local_commit = [string](git rev-parse HEAD)
$remote_commit = [string](git rev-parse "@{u}")

if($local_commit -eq $remote_commit) {
if($local_commit -eq $remote_commit) {
add-success "Branch is up to date."
} else {
} else {
$behind = [string](git rev-list --count $local_commit...$remote_commit)
add-warning "Branch is out of date by $behind commits. Run 'git pull' to update."
}
}
}

function confirm-node-version() {
Expand Down Expand Up @@ -122,8 +122,8 @@ function install-python-dependencies() {
add-failure "Invalid version of python installed. Needs python >= 3.5. You can either have globably available in the path as python, python3 or set the BL_PYTHON_PATH environment variable."
}

Write-Host "$python $root/scripts/install/install-python-dep.py"
cmd /c "$python $root/scripts/install/install-python-dep.py"
Write-Host "$python `"$root/scripts/install/install-python-dep.py`""
cmd /c "$python `"$root/scripts/install/install-python-dep.py`""

if($lastExitCode -eq 0) {
add-success "Installed python dependencies correctly" -foreground "green";
Expand Down

0 comments on commit f6f09e0

Please sign in to comment.