summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2010-02-09 16:56:33 +0000
committerDavid Wragg <dpw@lshift.net>2010-02-09 16:56:33 +0000
commitff0a705ca9614aeb8b8289f6fd324296d816e702 (patch)
tree04c9eb952468e18380be740c12c4f2ace2fe9538 /scripts
parent043e943a46523a2bd50efed1faf0829fc26a8a24 (diff)
downloadrabbitmq-server-git-ff0a705ca9614aeb8b8289f6fd324296d816e702.tar.gz
Fix rabbitmq-multi issue with parentheses in path
rabbitmq-multi would fail to start rabbitmq-server.bat if the path had parentheses in the first few characters of a path component (but not after the few few characters, due to short names being involved; so cases such as 'Program Files (x86)' do not trigger the issue). This fix makes rabbitmq-multi run rabbitmq-server.bat indirectly via cmd.exe, working around the erlang issue from bug20526. So we no longer need to involve short names, and by sprinkling double quotes in the right places we can handle parentheses too. To test this properly you need a path component with both spaces and parentheses in the first few characters, e.g. "foo ()".
Diffstat (limited to 'scripts')
-rw-r--r--scripts/rabbitmq-multi.bat3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index e5fb85226e..d4083cbdcd 100644
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -35,7 +35,6 @@ setlocal
rem Preserve values that might contain exclamation marks before
rem enabling delayed expansion
set TDP0=%~dp0
-set TSDP0=%~sdp0
set STAR=%*
setlocal enabledelayedexpansion
@@ -58,7 +57,7 @@ if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
)
set RABBITMQ_PIDS_FILE=!RABBITMQ_BASE!\rabbitmq.pids
-set RABBITMQ_SCRIPT_HOME=!TSDP0!
+set RABBITMQ_SCRIPT_HOME=!TDP0!
if "!RABBITMQ_CONFIG_FILE!"=="" (
set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq