3 files changed, 15 insertions, 35 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index a1aa5c9263..8657f1e609 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -6,28 +6,8 @@ REM setlocal
 rem Preserve values that might contain exclamation marks before
 rem enabling delayed expansion
 set TDP0=%~dp0
-set STAR=%*
 REM setlocal enabledelayedexpansion
 
-REM # Determine where this script is really located (if this script is
-REM # invoked from another script, this is the location of the caller)
-REM SCRIPT_PATH="$0"
-REM while [ -h "$SCRIPT_PATH" ] ; do
-REM     # Determine if readlink -f is supported at all. TODO clean this up.
-REM     FULL_PATH=`readlink -f $SCRIPT_PATH 2>/dev/null`
-REM     if [ "$?" != "0" ]; then
-REM       REL_PATH=`readlink $SCRIPT_PATH`
-REM       if expr "$REL_PATH" : '/.*' > /dev/null; then
-REM         SCRIPT_PATH="$REL_PATH"
-REM       else
-REM         SCRIPT_PATH="`dirname "$SCRIPT_PATH"`/$REL_PATH"
-REM       fi
-REM     else
-REM       SCRIPT_PATH=$FULL_PATH
-REM     fi
-REM done
-REM set -e
-
 REM SCRIPT_DIR=`dirname $SCRIPT_PATH`
 REM RABBITMQ_HOME="${SCRIPT_DIR}/.."
 set SCRIPT_DIR=%TDP0%
@@ -58,17 +38,6 @@ if exist "!RABBITMQ_CONF_ENV_FILE!" (
 	call !RABBITMQ_CONF_ENV_FILE!
 )
 
-REM [ "x" = "x$RABBITMQ_USE_LONGNAME" ] && RABBITMQ_USE_LONGNAME=${USE_LONGNAME}
-REM if [ "xtrue" = "x$RABBITMQ_USE_LONGNAME" ] ; then
-REM     RABBITMQ_NAME_TYPE=-name
-REM     [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -f`
-REM     [ "x" = "x$NODENAME" ] && NODENAME=rabbit@${HOSTNAME}
-REM else
-REM     RABBITMQ_NAME_TYPE=-sname
-REM     [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname`
-REM     [ "x" = "x$NODENAME" ] && NODENAME=rabbit@${HOSTNAME%%.*}
-REM fi
-
 REM Check for the short names here too
 if "!RABBITMQ_USE_LONGNAME!"=="" (
     if "!USE_LONGNAME!"=="" (
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 68a6284dd4..d6dd902ee9 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -26,7 +26,7 @@ setlocal enabledelayedexpansion
 
 REM Get default settings with user overrides for (RABBITMQ_)<var_name>
 REM Non-empty defaults should be set in rabbitmq-env
-call "%cd%\rabbitmq-env.bat"
+call "%TDP0%\rabbitmq-env.bat"
 
 set STARVAR=
 shift
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index ef9b13c7ae..45e2929579 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -24,11 +24,22 @@ set TDP0=%~dp0
 set STAR=%*
 setlocal enabledelayedexpansion
 
+if not exist "!ERLANG_HOME!\bin\erl.exe" (
+    echo.
+    echo ******************************
+    echo ERLANG_HOME not set correctly.
+    echo ******************************
+    echo.
+    echo Please either set ERLANG_HOME to point to your Erlang installation or place the
+    echo RabbitMQ server distribution in the Erlang lib folder.
+    echo.
+    exit /B 1
+)
+
 REM Get default settings with user overrides for (RABBITMQ_)<var_name>
 REM Non-empty defaults should be set in rabbitmq-env
-call "%cd%\rabbitmq-env.bat"
+call "%TDP0%\rabbitmq-env.bat"
 
-REM Uncomment this later, just for testing now
 "!ERLANG_HOME!\bin\erl.exe" ^
 -pa "!TDP0!..\ebin" ^
 -noinput ^
@@ -41,4 +52,4 @@ REM Uncomment this later, just for testing now
 -extra !STAR!
 
 endlocal
-endlocal
-\ No newline at end of file
+endlocal