From 1c89fe978d6199f3fe63daed1dec377d5378db7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 9 Feb 2016 11:09:09 +0100 Subject: [PATCH] rabbitmq-env.bat: Do not prepare and escape RABBITMQ_PLUGINS_EXPAND_DIR RabbitMQ recreates it anyway so we can't pass it the escaped directory name. Therefore, this directory must not contain any non-US-ASCII in its name. References #493. --- scripts/rabbitmq-env.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 66a1daf85112..8549b3e3dce6 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -224,10 +224,10 @@ if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" ( set RABBITMQ_PLUGINS_EXPAND_DIR=!PLUGINS_EXPAND_DIR! ) ) -if not exist "!RABBITMQ_PLUGINS_EXPAND_DIR!" ( - mkdir "!RABBITMQ_PLUGINS_EXPAND_DIR!" -) -for /f "delims=" %%F in ("!RABBITMQ_PLUGINS_EXPAND_DIR!") do set RABBITMQ_PLUGINS_EXPAND_DIR=%%~sF +REM FIXME: RabbitMQ removes and recreates RABBITMQ_PLUGINS_EXPAND_DIR +REM itself. Therefore we can't create it here in advance and escape the +REM directory name, and RABBITMQ_PLUGINS_EXPAND_DIR must not contain +REM non-US-ASCII characters. REM [ "x" = "x$RABBITMQ_ENABLED_PLUGINS_FILE" ] && RABBITMQ_ENABLED_PLUGINS_FILE=${ENABLED_PLUGINS_FILE} if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (