Fix Windows installation scripts

installer-bootstrap.ps1

@@ -1,6 +1,6 @@
-param($Work)
+param($noexit)
 
-if (!$Work) {
+if (!$noexit) {
     Write-Host "`nRestarting PowerShell with -NoExit...`n"
     powershell -NoExit -File $MyInvocation.MyCommand.Path 1
     return
@@ -18,23 +18,21 @@ $gitinstaller_url = "https://msysgit.googlecode.com/files/" + $gitinstaller_file
 $gitinstaller_local = $workdir + "\" + $gitinstaller_file
 
 Write-Host "Creating work directory: $workdir `n"
-New-Item -Path $workdir -Type directory -Force | Out-Null
+New-Item -Path $workdir -Type Directory -Force | Out-Null
 
 Write-Host "Downloading git...`n"
-$wc = New-Object System.Net.WebClient
-$wc.DownloadFile($gitinstaller_url, $gitinstaller_local)
+(New-Object System.Net.WebClient).DownloadFile($gitinstaller_url, $gitinstaller_local)
 
 Write-Host "Installing git...`n"
 Start-Process $gitinstaller_local '/silent /dir="C:\Git"' -Wait
-$env:Path += ";C:\Git\bin"; [Environment]::SetEnvironmentVariable( "Path", $env:Path, [System.EnvironmentVariableTarget]::Machine )
+$env:Path += ";C:\Git\bin"; [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
 
 Write-Host "Removing git installation files...`n"
 Remove-Item -Recurse -Force $basedir
 
 Write-Host "Downloading FrameworkBenchmarks from git...`n"
-&$git "clone" $repo $basedir | Out-Host
-&$git "checkout windows" | Out-Host
+&$git "clone" "--branch" "windows" $repo $basedir | Out-Host
 
 Write-Host "`nLaunching installer...`n"
-Set-ExecutionPolicy -ExecutionPolicy Bypass
+Set-ExecutionPolicy -ExecutionPolicy Bypass -ErrorAction 'SilentlyContinue'
 powershell -NoExit -File $installer

installer.ps1

@@ -47,7 +47,7 @@ $nodeinstaller_local = $workdir + "\" + $nodeinstaller_file
 (New-Object System.Net.WebClient).DownloadFile($nodeinstaller_url, $nodeinstaller_local)
 
 Start-Process $nodeinstaller_local '/passive' -Wait
-$env:Path += ";C:\Program Files\nodejs"; [Environment]::SetEnvironmentVariable( "Path", $env:Path, [System.EnvironmentVariableTarget]::Machine )
+$env:Path += ";C:\Program Files\nodejs"; [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
 
 #
 # Python
@@ -59,7 +59,7 @@ $pythoninstaller_local = $workdir + "\" + $pythoninstaller_file
 (New-Object System.Net.WebClient).DownloadFile($pythoninstaller_url, $pythoninstaller_local)
 
 Start-Process $pythoninstaller_local '/passive' -Wait
-$env:Path += ";C:\Python27"; [Environment]::SetEnvironmentVariable( "Path", $env:Path, [System.EnvironmentVariableTarget]::Machine )
+$env:Path += ";C:\Python27"; [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
 
 #
 # Firewall
@@ -67,4 +67,4 @@ $env:Path += ";C:\Python27"; [Environment]::SetEnvironmentVariable( "Path", $env
 Write-Host "Configuring firewall...`n"
 New-NetFirewallRule -DisplayName "HTTP 8080" -Action Allow -Direction Inbound -LocalPort 8080 -Protocol TCP | Out-Null
 
-cd "C:\FrameworkBenchmarks"
+cd $basedir