Skip to content

Commit 2a08bd7

Browse files
committed
Added some default placeholders for cm_options to script/cmtool.bat that hand off the cm_options to the cm's installer. However, the semantics of these can change depending on the cmtool, since not all support or need options.
1 parent 3428290 commit 2a08bd7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

script/cmtool.bat

+3
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ goto chef
8888
::::::::::::
8989
:chef
9090
::::::::::::
91+
if not defined CHEF_OPTIONS set CHEF_OPTIONS=%CM_OPTIONS%
9192

9293
for %%i in ("%CHEF_URL%") do set CHEF_MSI=%%~nxi
9394
set CHEF_DIR=%TEMP%\chef
@@ -116,6 +117,7 @@ goto exit0
116117
::::::::::::
117118
:puppet
118119
::::::::::::
120+
if not defined PUPPET_OPTIONS set PUPPET_OPTIONS=%CM_OPTIONS%
119121

120122
:: if "%CM_VERSION%" == "latest" set CM_VERSION=3.8.7
121123

@@ -157,6 +159,7 @@ goto exit0
157159
::::::::::::
158160
:salt
159161
::::::::::::
162+
if not defined SALT_OPTIONS set SALT_OPTIONS=%CM_OPTIONS%
160163

161164
if "%CM_VERSION%" == "latest" set CM_VERSION=2015.8.8-2
162165

0 commit comments

Comments
 (0)