summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-02-09 11:10:50 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-02-09 11:10:50 +0100
commit0120438b9441e6c4c1d650bf03e9e4995d9cab83 (patch)
treecfa5fb94b5527eaec5e0288585ada09c970eb720
parent2374ae85777e4b1005021c540936af3bba828681 (diff)
parent1c89fe978d6199f3fe63daed1dec377d5378db7e (diff)
downloadrabbitmq-server-git-0120438b9441e6c4c1d650bf03e9e4995d9cab83.tar.gz
Merge branch 'stable'
-rw-r--r--scripts/rabbitmq-env.bat8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index d402438fb5..981a2feddc 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!"=="" (