Skip to content

Commit

Permalink
rabbitmq-env.bat: Do not prepare and escape RABBITMQ_PLUGINS_EXPAND_DIR
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dumbbell committed Feb 9, 2016
1 parent 2a676f6 commit 1c89fe9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/rabbitmq-env.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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!"=="" (
Expand Down

0 comments on commit 1c89fe9

Please sign in to comment.