[MERGE #2204 @dilijev] MicroBuild v2: Fix logic in run_build.ps1 to correctly use the provided value of $binpath if it is provided.

dilijev · dilijev · commit 8df95e1f99d7 · 2016-12-15T16:23:58.000-08:00
Merge pull request #2204 from dilijev:mbv2
diff --git a/Build/scripts/run_build.ps1 b/Build/scripts/run_build.ps1
@@ -85,7 +85,8 @@ $buildlogsPath = Join-Path $binDir $buildlogsSubdir
 
 $skipPogo = $skipPogo -or (Test-Path Env:\SKIP_POGO)
 
-if (("$binpath" -ne "") -or (-not (Test-Path $binpath))) {
+# if $binpath is not set or if it is an invalid path, then infer it
+if ((-not $binpath) -or (-not (Test-Path $binpath))) {
     $binpath = Join-Path $binDir "bin\${buildName}"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ $buildlogsPath = Join-Path $binDir $buildlogsSubdir`
`85`	`85`
`86`	`86`	`$skipPogo = $skipPogo -or (Test-Path Env:\SKIP_POGO)`
`87`	`87`
`88`		`-if (("$binpath" -ne "") -or (-not (Test-Path $binpath))) {`
	`88`	`+# if $binpath is not set or if it is an invalid path, then infer it`
	`89`	`+if ((-not $binpath) -or (-not (Test-Path $binpath))) {`
`89`	`90`	`$binpath = Join-Path $binDir "bin\${buildName}"`
`90`	`91`	`}`
`91`	`92`