diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-10-29 09:49:05 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-10-29 09:49:05 +0000 |
| commit | 68a77dede5e1b40c8496853fed4eb3a03478b210 (patch) | |
| tree | cb3d3e78892ac13d70a98d1cf3a2d9b1be856768 | |
| parent | e13ef6f44f474a22861ce27fac356323b93daaa5 (diff) | |
| download | rabbitmq-server-git-68a77dede5e1b40c8496853fed4eb3a03478b210.tar.gz | |
prevent vars from escaping the script and polluting the env
also some minor cosmetic changes
| -rw-r--r-- | scripts/rabbitmq-activate-plugins.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-deactivate-plugins.bat | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-multi.bat | 12 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 4 |
5 files changed, 27 insertions, 1 deletions
diff --git a/scripts/rabbitmq-activate-plugins.bat b/scripts/rabbitmq-activate-plugins.bat index d639ff0e1f..e7aa709544 100644 --- a/scripts/rabbitmq-activate-plugins.bat +++ b/scripts/rabbitmq-activate-plugins.bat @@ -30,6 +30,8 @@ REM REM Contributor(s): ______________________________________.
REM
+setlocal
+
if not exist "%ERLANG_HOME%\bin\erl.exe" (
echo.
echo ******************************
@@ -54,3 +56,5 @@ set RABBITMQ_EBIN_DIR=%~dp0..\ebin -rabbit plugins_expand_dir \""%RABBITMQ_PLUGINS_EXPAND_DIR:\=/%"\" ^
-rabbit rabbit_ebin \""%RABBITMQ_EBIN_DIR:\=/%"\" ^
-extra %*
+
+endlocal
diff --git a/scripts/rabbitmq-deactivate-plugins.bat b/scripts/rabbitmq-deactivate-plugins.bat index 71e606051b..40155183a1 100644 --- a/scripts/rabbitmq-deactivate-plugins.bat +++ b/scripts/rabbitmq-deactivate-plugins.bat @@ -30,6 +30,10 @@ REM REM Contributor(s): ______________________________________.
REM
+setlocal
+
set RABBITMQ_EBIN_DIR=%~dp0..\ebin
del /f "%RABBITMQ_EBIN_DIR%"\rabbit.rel "%RABBITMQ_EBIN_DIR%"\rabbit.script "%RABBITMQ_EBIN_DIR%"\rabbit.boot
+
+endlocal
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat index 8abf13f192..8de18405b7 100755 --- a/scripts/rabbitmq-multi.bat +++ b/scripts/rabbitmq-multi.bat @@ -30,6 +30,8 @@ REM REM Contributor(s): ______________________________________.
REM
+setlocal
+
if "%RABBITMQ_BASE%"=="" (
set RABBITMQ_BASE=%APPDATA%\RabbitMQ
)
@@ -61,5 +63,13 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" ( exit /B
)
-"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden %RABBITMQ_MULTI_ERL_ARGS% -sname rabbitmq_multi -s rabbit_multi %RABBITMQ_MULTI_START_ARGS% -extra %*
+"%ERLANG_HOME%\bin\erl.exe" ^
+-pa "%~dp0..\ebin" ^
+-noinput -hidden ^
+%RABBITMQ_MULTI_ERL_ARGS% ^
+-sname rabbitmq_multi ^
+-s rabbit_multi ^
+%RABBITMQ_MULTI_START_ARGS% ^
+-extra %*
+endlocal
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 7cd3a33fb4..9c4bbe3e21 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -30,6 +30,8 @@ REM REM Contributor(s): ______________________________________.
REM
+setlocal
+
if "%RABBITMQ_BASE%"=="" (
set RABBITMQ_BASE=%APPDATA%\RabbitMQ
)
@@ -143,3 +145,5 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" ( %CLUSTER_CONFIG% ^
%RABBITMQ_SERVER_START_ARGS% ^
%*
+
+endlocal
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index bdfc22c054..7b911cbdb5 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -30,6 +30,8 @@ REM REM Contributor(s): ______________________________________.
REM
+setlocal
+
if "%RABBITMQ_SERVICENAME%"=="" (
set RABBITMQ_SERVICENAME=RabbitMQ
)
@@ -200,3 +202,5 @@ goto END :END
+
+endlocal
|