diff --git a/script/cmtool.bat b/script/cmtool.bat index f053000b..59399af1 100644 --- a/script/cmtool.bat +++ b/script/cmtool.bat @@ -258,20 +258,13 @@ if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "1" goto saltr :saltbootstrap :::::::::::: -:: We hardcode the CM_VERSION here to workaround saltstack/salt-bootstrap#1394 -if "%CM_VERSION%" == "latest" set CM_VERSION=2019.2.2 - set SALT_URL=http://raw.githubusercontent.com/saltstack/salt-bootstrap/%SALT_REVISION%/bootstrap-salt.ps1 - set SALT_PATH=%SALT_DIR%\bootstrap-salt.ps1 -set SALT_DOWNLOAD=%SALT_DIR%\bootstrap-salt.download.ps1 -echo ==^> Downloading %SALT_URL% to %SALT_DOWNLOAD% -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_DOWNLOAD%')" Downloading %SALT_URL% to %SALT_PATH% +powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" Patching bootstrap-salt.ps1 at %SALT_DOWNLOAD% -powershell -command "(get-content \"%SALT_DOWNLOAD%\") -replace \"'Tls,Tls11,Tls12'\", \"0xc0,0x300,0xc00\" | set-content \"%SALT_PATH%\"" +if not exist "%SALT_PATH%" goto exit1 echo ==^> Installing Salt minion with %SALT_PATH% if "%CM_VERSION%" == "latest" (