Bring set closer to check for envvars

VowpalWabbit · May 2, 2019 · ecd2720 · ecd2720
1 parent 0d9559d
commit ecd2720
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.scripts/init.cmd b/.scripts/init.cmd
@@ -12,20 +12,20 @@ IF NOT DEFINED vstestPath (
 )
 
 IF NOT DEFINED msbuildPath (
-    IF NOT EXIST "%VsInstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
+    IF EXIST "%VsInstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
+        SET "msBuildPath=%VsInstallDir%\MSBuild\15.0\Bin\MSBuild.exe"
+    ) ELSE (
         ECHO ERROR: MsBuild couldn't be found
         EXIT /b 1
-    ) ELSE (
-        SET "msBuildPath=%VsInstallDir%\MSBuild\15.0\Bin\MSBuild.exe"
     )
 )
 
 IF NOT DEFINED vstestPath (
-    IF NOT EXIST "%VsInstallDir%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" (
+    IF EXIST "%VsInstallDir%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" (
+        SET "vstestPath=%VsInstallDir%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"
+    ) ELSE (
         ECHO ERROR: vstest.console couldn't be found
         EXIT /b 1
-    ) ELSE (
-        SET "vstestPath=%VsInstallDir%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"
     )
 )