@@ -12,15 +12,15 @@ REM SCRIPT_DIR=`dirname $SCRIPT_PATH`
1212REM RABBITMQ_HOME="${SCRIPT_DIR}/.."
1313set SCRIPT_DIR = %TDP0%
1414set SCRIPT_NAME = %1
15- for /f " delims=" %%F in (" %SCRIPT_DIR% .." ) do set RABBITMQ_HOME = %%~dpsF %%~nF%%~xF
15+ for /f " delims=" %%F in (" %SCRIPT_DIR% .." ) do set RABBITMQ_HOME = %%~dpF %%~nF%%~xF
1616
1717REM If ERLANG_HOME is not defined, check if "erl.exe" is available in
1818REM the path and use that.
1919if not defined ERLANG_HOME (
2020 for /f " delims=" %%F in ('where.exe erl.exe') do @ set ERL_PATH = %%F
2121 if exist " !ERL_PATH! " (
2222 for /f " delims=" %%F in (" !ERL_PATH! " ) do set ERL_DIRNAME = %%~dpF
23- for /f " delims=" %%F in (" !ERL_DIRNAME! \.." ) do @ set ERLANG_HOME = %%~dpsF %%~nF%%~xF
23+ for /f " delims=" %%F in (" !ERL_DIRNAME! \.." ) do @ set ERLANG_HOME = %%~dpF %%~nF%%~xF
2424 )
2525 set ERL_PATH =
2626 set ERL_DIRNAME =
@@ -30,7 +30,9 @@ REM ## Set defaults
3030call " %SCRIPT_DIR% \rabbitmq-defaults.bat"
3131
3232if " !RABBITMQ_CONF_ENV_FILE! " == " " (
33- set RABBITMQ_CONF_ENV_FILE = !CONF_ENV_FILE!
33+ set RABBITMQ_CONF_ENV_FILE = !CONF_ENV_FILE:" =!
34+ ) else (
35+ set RABBITMQ_CONF_ENV_FILE = !RABBITMQ_CONF_ENV_FILE:" =!
3436)
3537
3638if exist " !RABBITMQ_CONF_ENV_FILE! " (
@@ -72,12 +74,6 @@ if "!RABBITMQ_MAX_NUMBER_OF_ATOMS!"=="" (
7274REM Common defaults
7375set SERVER_ERL_ARGS = +P !RABBITMQ_MAX_NUMBER_OF_PROCESSES! +t !RABBITMQ_MAX_NUMBER_OF_ATOMS! +stbt !RABBITMQ_SCHEDULER_BIND_TYPE! +zdbbl !RABBITMQ_DISTRIBUTION_BUFFER_SIZE!
7476
75- REM Make sure $RABBITMQ_BASE contains no non-ASCII characters.
76- if not exist " !RABBITMQ_BASE! " (
77- mkdir " !RABBITMQ_BASE! "
78- )
79- for /f " delims=" %%F in (" !RABBITMQ_BASE! " ) do set RABBITMQ_BASE = %%~sF
80-
8177REM Check for the short names here too
8278if " !RABBITMQ_USE_LONGNAME! " == " true" (
8379 set RABBITMQ_NAME_TYPE = -name
@@ -120,16 +116,6 @@ REM [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
120116REM [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_IP_ADDRESS=${DEFAULT_NODE_IP_ADDRESS}
121117REM [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${DEFAULT_NODE_PORT}
122118
123- REM if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
124- REM if not "!RABBITMQ_NODE_PORT!"=="" (
125- REM set RABBITMQ_NODE_IP_ADDRESS=auto
126- REM )
127- REM ) else (
128- REM if "!RABBITMQ_NODE_PORT!"=="" (
129- REM set RABBITMQ_NODE_PORT=5672
130- REM )
131- REM )
132-
133119if " !RABBITMQ_NODE_IP_ADDRESS! " == " " (
134120 if not " !NODE_IP_ADDRESS! " == " " (
135121 set RABBITMQ_NODE_IP_ADDRESS = !NODE_IP_ADDRESS!
@@ -174,65 +160,73 @@ if "!RABBITMQ_SERVER_ERL_ARGS!"=="" (
174160)
175161
176162REM [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}
177- CALL :unquote RABBITMQ_CONFIG_FILE %RABBITMQ_CONFIG_FILE%
178163if " !RABBITMQ_CONFIG_FILE! " == " " (
179164 if " !CONFIG_FILE! " == " " (
180165 set RABBITMQ_CONFIG_FILE = !RABBITMQ_BASE! \rabbitmq
181166 ) else (
182- set RABBITMQ_CONFIG_FILE = !CONFIG_FILE!
167+ set RABBITMQ_CONFIG_FILE = !CONFIG_FILE: " = !
183168 )
169+ ) else (
170+ set RABBITMQ_CONFIG_FILE = !RABBITMQ_CONFIG_FILE:" =!
184171)
185172
186173if " !RABBITMQ_GENERATED_CONFIG_DIR! " == " " (
187174 if " !GENERATED_CONFIG_DIR! " == " " (
188175 set RABBITMQ_GENERATED_CONFIG_DIR = !RABBITMQ_BASE! \config
189176 ) else (
190- set RABBITMQ_GENERATED_CONFIG_DIR = !GENERATED_CONFIG_DIR!
177+ set RABBITMQ_GENERATED_CONFIG_DIR = !GENERATED_CONFIG_DIR: " = !
191178 )
179+ ) else (
180+ set RABBITMQ_GENERATED_CONFIG_DIR = !RABBITMQ_GENERATED_CONFIG_DIR:" =!
192181)
193182
194- CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%
195183if " !RABBITMQ_ADVANCED_CONFIG_FILE! " == " " (
196184 if " !ADVANCED_CONFIG_FILE! " == " " (
197185 set RABBITMQ_ADVANCED_CONFIG_FILE = !RABBITMQ_BASE! \advanced.config
198186 ) else (
199- set RABBITMQ_ADVANCED_CONFIG_FILE = !ADVANCED_CONFIG_FILE!
187+ set RABBITMQ_ADVANCED_CONFIG_FILE = !ADVANCED_CONFIG_FILE: " = !
200188 )
189+ ) else (
190+ set RABBITMQ_ADVANCED_CONFIG_FILE = !RABBITMQ_ADVANCED_CONFIG_FILE:" =!
201191)
202192
203193if " !RABBITMQ_SCHEMA_DIR! " == " " (
204194 if " !SCHEMA_DIR! " == " " (
205195 set RABBITMQ_SCHEMA_DIR = !RABBITMQ_HOME! \priv\schema
206196 ) else (
207- set RABBITMQ_SCHEMA_DIR = !SCHEMA_DIR!
197+ set RABBITMQ_SCHEMA_DIR = !SCHEMA_DIR: " = !
208198 )
199+ ) else (
200+ set RABBITMQ_SCHEMA_DIR = !RABBITMQ_SCHEMA_DIR:" =!
209201)
210202
211203REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
212204if " !RABBITMQ_LOG_BASE! " == " " (
213205 if " !LOG_BASE! " == " " (
214206 set RABBITMQ_LOG_BASE = !RABBITMQ_BASE! \log
215207 ) else (
216- set RABBITMQ_LOG_BASE = !LOG_BASE!
208+ set RABBITMQ_LOG_BASE = !LOG_BASE: " = !
217209 )
210+ ) else (
211+ set RABBITMQ_LOG_BASE = !RABBITMQ_LOG_BASE:" =!
218212)
219213if not exist " !RABBITMQ_LOG_BASE! " (
220214 mkdir " !RABBITMQ_LOG_BASE! "
221215)
222- for /f " delims=" %%F in (" !RABBITMQ_LOG_BASE! " ) do set RABBITMQ_LOG_BASE = %%~sF
223216
224217REM [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE}
225218if " !RABBITMQ_MNESIA_BASE! " == " " (
226219 if " !MNESIA_BASE! " == " " (
227220 set RABBITMQ_MNESIA_BASE = !RABBITMQ_BASE! \db
228221 ) else (
229- set RABBITMQ_MNESIA_BASE = !MNESIA_BASE!
222+ set RABBITMQ_MNESIA_BASE = !MNESIA_BASE: " = !
230223 )
224+ ) else (
225+ set RABBITMQ_MNESIA_BASE = !RABBITMQ_MNESIA_BASE:" =!
231226)
232227if not exist " !RABBITMQ_MNESIA_BASE! " (
233228 mkdir " !RABBITMQ_MNESIA_BASE! "
234229)
235- for /f " delims=" %%F in (" !RABBITMQ_MNESIA_BASE! " ) do set RABBITMQ_MNESIA_BASE = %%~sF
236230
237231REM [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS}
238232if " !RABBITMQ_SERVER_START_ARGS! " == " " (
@@ -254,13 +248,14 @@ if "!RABBITMQ_MNESIA_DIR!"=="" (
254248 if " !MNESIA_DIR! " == " " (
255249 set RABBITMQ_MNESIA_DIR = !RABBITMQ_MNESIA_BASE! \!RABBITMQ_NODENAME! -mnesia
256250 ) else (
257- set RABBITMQ_MNESIA_DIR = !MNESIA_DIR!
251+ set RABBITMQ_MNESIA_DIR = !MNESIA_DIR: " = !
258252 )
253+ ) else (
254+ set RABBITMQ_MNESIA_DIR = !RABBITMQ_MNESIA_DIR:" =!
259255)
260256if not exist " !RABBITMQ_MNESIA_DIR! " (
261257 mkdir " !RABBITMQ_MNESIA_DIR! "
262258)
263- for /f " delims=" %%F in (" !RABBITMQ_MNESIA_DIR! " ) do set RABBITMQ_MNESIA_DIR = %%~sF
264259
265260REM [ "x" = "x$RABBITMQ_QUORUM_DIR" ] && RABBITMQ_QUORUM_DIR=${RABBITMQ_MNESIA_DIR}/quorum
266261if " !RABBITMQ_QUORUM_DIR! " == " " (
@@ -289,8 +284,10 @@ if "!RABBITMQ_FEATURE_FLAGS_FILE!"=="" (
289284 if " !FEATURE_FLAGS_FILE! " == " " (
290285 set RABBITMQ_FEATURE_FLAGS_FILE = !RABBITMQ_MNESIA_BASE! \!RABBITMQ_NODENAME! -feature_flags
291286 ) else (
292- set RABBITMQ_FEATURE_FLAGS_FILE = !FEATURE_FLAGS_FILE!
287+ set RABBITMQ_FEATURE_FLAGS_FILE = !FEATURE_FLAGS_FILE: " = !
293288 )
289+ ) else (
290+ set RABBITMQ_FEATURE_FLAGS_FILE = !RABBITMQ_FEATURE_FLAGS_FILE:" =!
294291)
295292
296293REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR}
@@ -299,44 +296,42 @@ if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" (
299296 if " !PLUGINS_EXPAND_DIR! " == " " (
300297 set RABBITMQ_PLUGINS_EXPAND_DIR = !RABBITMQ_MNESIA_BASE! \!RABBITMQ_NODENAME! -plugins-expand
301298 ) else (
302- set RABBITMQ_PLUGINS_EXPAND_DIR = !PLUGINS_EXPAND_DIR!
299+ set RABBITMQ_PLUGINS_EXPAND_DIR = !PLUGINS_EXPAND_DIR: " = !
303300 )
301+ ) else (
302+ set RABBITMQ_PLUGINS_EXPAND_DIR = !RABBITMQ_PLUGINS_EXPAND_DIR:" =!
304303)
305- REM FIXME: RabbitMQ removes and recreates RABBITMQ_PLUGINS_EXPAND_DIR
306- REM itself. Therefore we can't create it here in advance and escape the
307- REM directory name, and RABBITMQ_PLUGINS_EXPAND_DIR must not contain
308- REM non-US-ASCII characters.
309304
310305REM [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE}
311306if " !RABBITMQ_ENABLED_PLUGINS_FILE! " == " " (
312307 if " !ENABLED_PLUGINS_FILE! " == " " (
313308 set RABBITMQ_ENABLED_PLUGINS_FILE = !RABBITMQ_BASE! \enabled_plugins
314309 ) else (
315- set RABBITMQ_ENABLED_PLUGINS_FILE = !ENABLED_PLUGINS_FILE!
310+ set RABBITMQ_ENABLED_PLUGINS_FILE = !ENABLED_PLUGINS_FILE: " = !
316311 )
317312) else (
313+ set RABBITMQ_ENABLED_PLUGINS_FILE = !RABBITMQ_ENABLED_PLUGINS_FILE:" =!
318314 set RABBITMQ_ENABLED_PLUGINS_FILE_source = environment
319315)
320316if not exist " !RABBITMQ_ENABLED_PLUGINS_FILE! " (
321- for /f " delims=" %%F in (" !RABBITMQ_ENABLED_PLUGINS_FILE! " ) do mkdir %%~dpF 2 > NUL
317+ for /f " delims=" %%F in (" !RABBITMQ_ENABLED_PLUGINS_FILE! " ) do mkdir " %%~dpF " 2 > NUL
322318 copy /y NUL " !RABBITMQ_ENABLED_PLUGINS_FILE! " > NUL
323319)
324- for /f " delims=" %%F in (" !RABBITMQ_ENABLED_PLUGINS_FILE! " ) do set RABBITMQ_ENABLED_PLUGINS_FILE = %%~sF
325320
326321REM [ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR=${PLUGINS_DIR}
327322if " !RABBITMQ_PLUGINS_DIR! " == " " (
328323 if " !PLUGINS_DIR! " == " " (
329324 set RABBITMQ_PLUGINS_DIR = !RABBITMQ_HOME! \plugins
330325 ) else (
331- set RABBITMQ_PLUGINS_DIR = !PLUGINS_DIR!
326+ set RABBITMQ_PLUGINS_DIR = !PLUGINS_DIR: " = !
332327 )
333328) else (
329+ set RABBITMQ_PLUGINS_DIR = !RABBITMQ_PLUGINS_DIR:" =!
334330 set RABBITMQ_PLUGINS_DIR_source = environment
335331)
336332if not exist " !RABBITMQ_PLUGINS_DIR! " (
337333 mkdir " !RABBITMQ_PLUGINS_DIR! "
338334)
339- for /f " delims=" %%F in (" !RABBITMQ_PLUGINS_DIR! " ) do set RABBITMQ_PLUGINS_DIR = %%~sF
340335
341336REM ## Log rotation
342337REM [ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS=${LOGS}
@@ -345,23 +340,28 @@ if "!RABBITMQ_LOGS!"=="" (
345340 if " !LOGS! " == " " (
346341 set RABBITMQ_LOGS = !RABBITMQ_LOG_BASE! \!RABBITMQ_NODENAME! .log
347342 ) else (
348- set RABBITMQ_LOGS = !LOGS!
343+ set RABBITMQ_LOGS = !LOGS: " = !
349344 )
345+ ) else (
346+ set RABBITMQ_LOGS = !RABBITMQ_LOGS:" =!
350347)
351348if not " !RABBITMQ_LOGS! " == " -" (
352349 if not exist " !RABBITMQ_LOGS! " (
353- for /f " delims=" %%F in (" !RABBITMQ_LOGS! " ) do mkdir %%~dpF 2 > NUL
350+ for /f " delims=" %%F in (" !RABBITMQ_LOGS! " ) do mkdir " %%~dpF " 2 > NUL
354351 copy /y NUL " !RABBITMQ_LOGS! " > NUL
355352 )
356- for /f " delims=" %%F in (" !RABBITMQ_LOGS! " ) do set RABBITMQ_LOGS = %%~sF
357353)
358354rem [ "x" = "x$RABBITMQ_UPGRADE_LOG" ] && RABBITMQ_UPGRADE_LOG="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}_upgrade.log"
359355if " !RABBITMQ_UPGRADE_LOG! " == " " (
360356 set RABBITMQ_UPGRADE_LOG = !RABBITMQ_LOG_BASE! \!RABBITMQ_NODENAME! _upgrade.log
357+ ) else (
358+ set RABBITMQ_UPGRADE_LOG = !RABBITMQ_UPGRADE_LOG:" =!
361359)
362360REM [ "x" = "x$ERL_CRASH_DUMP"] && ERL_CRASH_DUMP="${RABBITMQ_LOG_BASE}/erl_crash.dump"
363361if " !ERL_CRASH_DUMP! " == " " (
364362 set ERL_CRASH_DUMP = !RABBITMQ_LOG_BASE! \erl_crash.dump
363+ ) else (
364+ set ERL_CRASH_DUMP = !ERL_CRASH_DUMP:" =!
365365)
366366
367367REM [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
@@ -388,10 +388,6 @@ if "!RABBITMQ_CTL_DIST_PORT_MAX!"=="" (
388388)
389389
390390REM ADDITIONAL WINDOWS ONLY CONFIG ITEMS
391- REM rabbitmq-plugins.bat
392- REM if "!RABBITMQ_SERVICENAME!"=="" (
393- REM set RABBITMQ_SERVICENAME=RabbitMQ
394- REM )
395391
396392if " !RABBITMQ_SERVICENAME! " == " " (
397393 if " !SERVICENAME! " == " " (
@@ -409,21 +405,21 @@ if defined RABBITMQ_DEV_ENV (
409405 if not " %RABBITMQ_FEATURE_FLAGS_FILE_source% " == " environment" (
410406 for /f " delims=" %%F in ('!SCRIPT_DIR! \rabbitmqctl eval " {ok, P} = application:get_env(rabbit, feature_flags_file), io:format(" " ~s~n" " , [P])." ') do @ set feature_flags_file = %%F
411407 if exist " !feature_flags_file! " (
412- set RABBITMQ_FEATURE_FLAGS_FILE = !feature_flags_file!
408+ set RABBITMQ_FEATURE_FLAGS_FILE = !feature_flags_file: " = !
413409 )
414410 REM set feature_flags_file=
415411 )
416412 if not " %RABBITMQ_PLUGINS_DIR_source% " == " environment" (
417413 for /f " delims=" %%F in ('!SCRIPT_DIR! \rabbitmqctl eval " {ok, P} = application:get_env(rabbit, plugins_dir), io:format(" " ~s~n" " , [P])." ') do @ set plugins_dir = %%F
418414 if exist " !plugins_dir! " (
419- set RABBITMQ_PLUGINS_DIR = !plugins_dir!
415+ set RABBITMQ_PLUGINS_DIR = !plugins_dir: " = !
420416 )
421417 REM set plugins_dir=
422418 )
423419 if not " %RABBITMQ_ENABLED_PLUGINS_FILE_source% " == " environment" (
424420 for /f " delims=" %%F in ('!SCRIPT_DIR! \rabbitmqctl eval " {ok, P} = application:get_env(rabbit, enabled_plugins_file), io:format(" " ~s~n" " , [P])." ') do @ set enabled_plugins_file = %%F
425421 if exist " !enabled_plugins_file! " (
426- set RABBITMQ_ENABLED_PLUGINS_FILE = !enabled_plugins_file!
422+ set RABBITMQ_ENABLED_PLUGINS_FILE = !enabled_plugins_file: " = !
427423 )
428424 REM set enabled_plugins_file=
429425 )
@@ -441,15 +437,15 @@ if defined RABBITMQ_DEV_ENV (
441437 if " !DEPS_DIR! " == " " (
442438 if exist " !RABBITMQ_HOME! \..\..\deps\rabbit_common\erlang.mk" (
443439 REM Dependencies in the Umbrella or a plugin.
444- set DEPS_DIR_norm = " !RABBITMQ_HOME! \..\..\deps"
440+ set DEPS_DIR_norm = !RABBITMQ_HOME! \..\..\deps
445441 ) else (
446442 if exist " !RABBITMQ_HOME! \deps\rabbit_common\erlang.mk" (
447443 REM Dependencies in the broker.
448- set DEPS_DIR_norm = " !RABBITMQ_HOME! \deps"
444+ set DEPS_DIR_norm = !RABBITMQ_HOME! \deps
449445 )
450446 )
451447 ) else (
452- for /f " delims=" %%F in (" !DEPS_DIR! " ) do @ set DEPS_DIR_norm = %%~dpsF %%~nF%%~xF
448+ for /f " delims=" %%F in (" !DEPS_DIR! " ) do @ set DEPS_DIR_norm = %%~dpF %%~nF%%~xF
453449 )
454450
455451 set ERL_LIBS = !DEPS_DIR_norm! ;!ERL_LIBS!
@@ -458,12 +454,12 @@ if defined RABBITMQ_DEV_ENV (
458454 if exist " !RABBITMQ_PLUGINS_DIR! " (
459455 REM RabbitMQ was started from its install directory. Take
460456 REM rabbit_common from the plugins directory.
461- set ERL_LIBS = !RABBITMQ_PLUGINS_DIR! ;!ERL_LIBS!
457+ set ERL_LIBS = !RABBITMQ_PLUGINS_DIR: " = ! ;!ERL_LIBS: " = !
462458 )
463459)
464460
465- REM Ensure all paths in ERL_LIBS do not contains non-ASCII characters.
466- set ERL_LIBS_orig = %ERL_LIBS%
461+ REM Ensure ERL_LIBS begins with valid path
462+ set ERL_LIBS_orig = %ERL_LIBS: " = %
467463set ERL_LIBS =
468464call :filter_paths " %ERL_LIBS_orig% "
469465goto :filter_paths_done
@@ -476,16 +472,15 @@ for /f "tokens=1* delims=;" %%a in ("%paths%") do (
476472 if not " %%b " == " " call :filter_paths " %%b "
477473)
478474set paths =
479- exit /b
475+ goto : eof
480476
481477:filter_path
482- REM Ensure ERL_LIBS begins with valid path
483478IF " %ERL_LIBS% " == " " (
484- set ERL_LIBS = %~dps1 %~n1%~x1
479+ set ERL_LIBS = %~dp1 %~n1%~x1
485480) else (
486- set ERL_LIBS = %ERL_LIBS% ;%~dps1 %~n1%~x1
481+ set ERL_LIBS = %ERL_LIBS% ;%~dp1 %~n1%~x1
487482)
488- exit /b
483+ goto : eof
489484
490485:filter_paths_done
491486
@@ -505,7 +500,3 @@ REM ##--- End of overridden <var_name> variables
505500REM
506501REM # Since we source this elsewhere, don't accidentally stop execution
507502REM true
508-
509- :unquote
510- set %1 =%~2
511- EXIT /B 0
0 commit comments