rabbitmq-defaults.bat and rabbitmq-echopid.bat: Fix line ending

2 files changed, 98 insertions, 98 deletions

diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat
index cf04eb612f..2125af68f1 100644
--- a/scripts/rabbitmq-defaults.bat
+++ b/scripts/rabbitmq-defaults.bat
@@ -1,43 +1,43 @@
-@echo off


-


-REM ### next line potentially updated in package install steps


-REM set SYS_PREFIX=


-


-REM ### next line will be updated when generating a standalone release


-REM ERL_DIR=


-set ERL_DIR=


-


-REM These boot files don't appear to be referenced in the batch scripts


-REM set CLEAN_BOOT_FILE=start_clean


-REM set SASL_BOOT_FILE=start_sasl


-


-if exist "%RABBITMQ_HOME%\erlang.mk" (


-    REM RabbitMQ is executed from its source directory. The plugins


-    REM directory and ERL_LIBS are tuned based on this.


-    set RABBITMQ_DEV_ENV=1


-)


-


-REM ## Set default values


-


-if "!RABBITMQ_BASE!"=="" (


-    set RABBITMQ_BASE=!APPDATA!\RabbitMQ


-)


-


-REM BOOT_MODULE="rabbit"


-REM CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq


-REM LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq


-REM MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia


-REM ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins


-set BOOT_MODULE=rabbit


-set CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq


-set LOG_BASE=!RABBITMQ_BASE!\log


-set MNESIA_BASE=!RABBITMQ_BASE!\db


-set ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins


-


-REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"


-set PLUGINS_DIR=!TDP0!..\plugins


-


-REM CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf


-if "!RABBITMQ_CONF_ENV_FILE!"=="" (


-    set RABBITMQ_CONF_ENV_FILE=!RABBITMQ_BASE!\rabbitmq-env-conf.bat


-)


+@echo off

+

+REM ### next line potentially updated in package install steps

+REM set SYS_PREFIX=

+

+REM ### next line will be updated when generating a standalone release

+REM ERL_DIR=

+set ERL_DIR=

+

+REM These boot files don't appear to be referenced in the batch scripts

+REM set CLEAN_BOOT_FILE=start_clean

+REM set SASL_BOOT_FILE=start_sasl

+

+if exist "%RABBITMQ_HOME%\erlang.mk" (

+    REM RabbitMQ is executed from its source directory. The plugins

+    REM directory and ERL_LIBS are tuned based on this.

+    set RABBITMQ_DEV_ENV=1

+)

+

+REM ## Set default values

+

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\RabbitMQ

+)

+

+REM BOOT_MODULE="rabbit"

+REM CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq

+REM LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq

+REM MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia

+REM ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins

+set BOOT_MODULE=rabbit

+set CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

+set LOG_BASE=!RABBITMQ_BASE!\log

+set MNESIA_BASE=!RABBITMQ_BASE!\db

+set ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins

+

+REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"

+set PLUGINS_DIR=!TDP0!..\plugins

+

+REM CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf

+if "!RABBITMQ_CONF_ENV_FILE!"=="" (

+    set RABBITMQ_CONF_ENV_FILE=!RABBITMQ_BASE!\rabbitmq-env-conf.bat

+)

diff --git a/scripts/rabbitmq-echopid.bat b/scripts/rabbitmq-echopid.bat
index fa08dec4ac..650fcc5202 100644
--- a/scripts/rabbitmq-echopid.bat
+++ b/scripts/rabbitmq-echopid.bat
@@ -1,55 +1,55 @@
-@echo off


-


-REM Usage: rabbitmq-echopid.bat <rabbitmq_nodename>


-REM


-REM <rabbitmq_nodename> (s)name of the erlang node to connect to (required)


-


-setlocal


-


-set TDP0=%~dp0


-


-REM Get default settings with user overrides for (RABBITMQ_)<var_name>


-REM Non-empty defaults should be set in rabbitmq-env


-call "!TDP0!\rabbitmq-env.bat" %~n0


-


-if "%1"=="" goto fail


-


-:: set timeout vars ::


-set TIMEOUT=10


-set TIMER=1


-


-:: check that wmic exists ::


-set WMIC_PATH=%SYSTEMROOT%\System32\Wbem\wmic.exe


-if not exist "%WMIC_PATH%" (


-  goto fail


-)


-


-:getpid


-for /f "usebackq tokens=* skip=1" %%P IN (`%%WMIC_PATH%% process where "name='erl.exe' and commandline like '%%%RABBITMQ_NAME_TYPE% %1%%'" get processid 2^>nul`) do (


-  set PID=%%P


-  goto echopid


-)


-


-:echopid


-:: check for pid not found ::


-if "%PID%" == "" (


-  PING 127.0.0.1 -n 2 > nul


-  set /a TIMER+=1


-  if %TIMEOUT%==%TIMER% goto fail


-  goto getpid


-)


-


-:: show pid ::


-echo %PID%


-


-:: all done ::


-:ok


-endlocal


-EXIT /B 0


-


-:: something went wrong ::


-:fail


-endlocal


-EXIT /B 1


-


-


+@echo off

+

+REM Usage: rabbitmq-echopid.bat <rabbitmq_nodename>

+REM

+REM <rabbitmq_nodename> (s)name of the erlang node to connect to (required)

+

+setlocal

+

+set TDP0=%~dp0

+

+REM Get default settings with user overrides for (RABBITMQ_)<var_name>

+REM Non-empty defaults should be set in rabbitmq-env

+call "!TDP0!\rabbitmq-env.bat" %~n0

+

+if "%1"=="" goto fail

+

+:: set timeout vars ::

+set TIMEOUT=10

+set TIMER=1

+

+:: check that wmic exists ::

+set WMIC_PATH=%SYSTEMROOT%\System32\Wbem\wmic.exe

+if not exist "%WMIC_PATH%" (

+  goto fail

+)

+

+:getpid

+for /f "usebackq tokens=* skip=1" %%P IN (`%%WMIC_PATH%% process where "name='erl.exe' and commandline like '%%%RABBITMQ_NAME_TYPE% %1%%'" get processid 2^>nul`) do (

+  set PID=%%P

+  goto echopid

+)

+

+:echopid

+:: check for pid not found ::

+if "%PID%" == "" (

+  PING 127.0.0.1 -n 2 > nul

+  set /a TIMER+=1

+  if %TIMEOUT%==%TIMER% goto fail

+  goto getpid

+)

+

+:: show pid ::

+echo %PID%

+

+:: all done ::

+:ok

+endlocal

+EXIT /B 0

+

+:: something went wrong ::

+:fail

+endlocal

+EXIT /B 1

+

+