Skip to content

Commit

Permalink
Updated script/cmtool.bat to emit the detected platform version, and …
Browse files Browse the repository at this point in the history
…added checks for more versions when determining whether to use saltbootstrap or saltrepository.
  • Loading branch information
arizvisa committed Jan 9, 2020
1 parent 14259e4 commit 12ed28a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion script/cmtool.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ for /f "delims=.; tokens=1,2" %%a in ("%PlatformVersionRow%") do (
for /f "tokens=*" %%v in ("%%b") do set PlatformVersionMinor=%%v
)

echo ==^> Detected Windows Platform Version: %PlatformVersionMajor%.%PlatformVersionMinor%

:: Set some reasonable defaults
if not defined TEMP set TEMP=%LOCALAPPDATA%\Temp

Expand Down Expand Up @@ -184,7 +186,8 @@ pushd "%SALT_DIR%"

:: If we're on a platform where salt-bootstrap is buggy, then fall back to just
:: using the regular salt-repository method.
if "%PlatformVersionMajor%" == "6" goto saltrepository
if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "0" goto saltrepository
if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "1" goto saltrepository

::::::::::::
:saltbootstrap
Expand Down

0 comments on commit 12ed28a

Please sign in to comment.