diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-06-17 05:35:21 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-06-17 05:35:21 +0300 |
| commit | 836ae267e6a959a0243de38ce0ae4200f935b446 (patch) | |
| tree | fe92435ea9f32311f8e4ab2216ced839df54787b | |
| parent | ce85ac7bb66203b19630317cc52fec81f3299cda (diff) | |
| download | rabbitmq-server-git-836ae267e6a959a0243de38ce0ae4200f935b446.tar.gz | |
Revert "Using square brackets could cause an error"
This reverts commit ce85ac7bb66203b19630317cc52fec81f3299cda.
This includes some master-specific bits.
| -rw-r--r-- | scripts/rabbitmq-env.bat | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 612fe9c2b5..7a38aa0b37 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -175,31 +175,6 @@ if "!RABBITMQ_CONFIG_FILE!"=="" ( )
)
-if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
- if "!GENERATED_CONFIG_DIR!"=="" (
- set RABBITMQ_GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config
- ) else (
- set RABBITMQ_GENERATED_CONFIG_DIR=!GENERATED_CONFIG_DIR!
- )
-)
-
-CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%
-if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (
- if "!ADVANCED_CONFIG_FILE!"=="" (
- set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced
- ) else (
- set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!
- )
-)
-
-if "!RABBITMQ_SCHEMA_DIR!" == "" (
- if "!SCHEMA_DIR!"=="" (
- set RABBITMQ_SCHEMA_DIR=!RABBITMQ_HOME!\priv\schema
- ) else (
- set RABBITMQ_SCHEMA_DIR=!SCHEMA_DIR!
- )
-)
-
REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
if "!RABBITMQ_LOG_BASE!"=="" (
if "!LOG_BASE!"=="" (
@@ -432,7 +407,7 @@ exit /b :filter_path
REM Ensure ERL_LIBS begins with valid path
-IF "%ERL_LIBS%"=="" (
+IF [%ERL_LIBS%] EQU [] (
set ERL_LIBS=%~dps1%~n1%~x1
) else (
set ERL_LIBS=%ERL_LIBS%;%~dps1%~n1%~x1
|