Merge pull request #1269 from rabbitmq/fix-windows-empty-string

michaelklishin · web-flow · commit fc1d2fac7004 · 2017-06-17T03:58:20.000+03:00
Using square brackets could cause an error
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
@@ -202,7 +202,6 @@ if "!RABBITMQ_SCHEMA_DIR!" == "" (
     )
 )
 
-
 REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
 if "!RABBITMQ_LOG_BASE!"=="" (
     if "!LOG_BASE!"=="" (
@@ -418,7 +417,7 @@ exit /b
 
 :filter_path
 REM Ensure ERL_LIBS begins with valid path
-IF [%ERL_LIBS%] EQU [] (
+IF "%ERL_LIBS%"=="" (
     set ERL_LIBS=%~dps1%~n1%~x1
 ) else (
     set ERL_LIBS=%ERL_LIBS%;%~dps1%~n1%~x1

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,6 @@ if "!RABBITMQ_SCHEMA_DIR!" == "" (`
`202`	`202`	`)`
`203`	`203`	`)`
`204`	`204`
`205`		`-`
`206`	`205`	`REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}`
`207`	`206`	`if "!RABBITMQ_LOG_BASE!"=="" (`
`208`	`207`	`if "!LOG_BASE!"=="" (`
`@@ -418,7 +417,7 @@ exit /b`
`418`	`417`
`419`	`418`	`:filter_path`
`420`	`419`	`REM Ensure ERL_LIBS begins with valid path`
`421`		`-IF [%ERL_LIBS%] EQU [] (`
	`420`	`+IF "%ERL_LIBS%"=="" (`
`422`	`421`	`set ERL_LIBS=%~dps1%~n1%~x1`
`423`	`422`	`) else (`
`424`	`423`	`set ERL_LIBS=%ERL_LIBS%;%~dps1%~n1%~x1`