diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-02-13 16:53:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 16:53:31 +0000 |
| commit | 41ec73b886a23c80f40960137d8a11de6454e50c (patch) | |
| tree | 259cf7923ec3b8d6f14f6710dac15f2e9bcce90d | |
| parent | 2254c8fa377fb891d7c3c6e2e2e44152eab9fdcf (diff) | |
| parent | a7bf9cb0abfc55f2190c5f04d3a73625b025dc8b (diff) | |
| download | rabbitmq-server-git-41ec73b886a23c80f40960137d8a11de6454e50c.tar.gz | |
Merge pull request #1509 from rabbitmq/rabbitmq-server-1508v3.7.4-rc.1
Fix batch file issues with env variables
| -rw-r--r-- | scripts/rabbitmq-env.bat | 13 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 6 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 58aa5a2ce7..8b27f83cc2 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -73,17 +73,16 @@ if not exist "!RABBITMQ_BASE!" ( for /f "delims=" %%F in ("!RABBITMQ_BASE!") do set RABBITMQ_BASE=%%~sF
REM Check for the short names here too
-if "!RABBITMQ_USE_LONGNAME!"=="" (
- if "!USE_LONGNAME!"=="" (
- set RABBITMQ_NAME_TYPE="-sname"
- set NAMETYPE=shortnames
- )
-)
-
if "!RABBITMQ_USE_LONGNAME!"=="true" (
+ set RABBITMQ_NAME_TYPE="-name"
+ set NAMETYPE=longnames
+) else (
if "!USE_LONGNAME!"=="true" (
set RABBITMQ_NAME_TYPE="-name"
set NAMETYPE=longnames
+ ) else (
+ set RABBITMQ_NAME_TYPE="-sname"
+ set NAMETYPE=shortnames
)
)
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 2035e92f2a..4a4d36412f 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -57,10 +57,10 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co -pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput -hidden ^
-s rabbit_prelaunch ^
- !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9! ^
- -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
+ -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
- -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^
+ -rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
+ !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost ^
-extra "!RABBITMQ_NODENAME!"
if ERRORLEVEL 2 (
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index ed5b67257a..232a45d6cb 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -143,8 +143,8 @@ if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.co -s rabbit_prelaunch ^
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
-rabbit enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
- -rabbit plugins_dir "!$RABBITMQ_PLUGINS_DIR!" ^
- !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!
+ -rabbit plugins_dir "!RABBITMQ_PLUGINS_DIR!" ^
+ !RABBITMQ_NAME_TYPE! rabbitmqprelaunch!RANDOM!!TIME:~9!@localhost
if ERRORLEVEL 3 (
rem ERRORLEVEL means (or greater) so we need to catch all other failure
|