From 403786326c589a18968f2d3d1cb318e5a09a52b8 Mon Sep 17 00:00:00 2001
From: Alvaro Videla <alvaro@rabbitmq.com>
Date: Wed, 7 Nov 2012 16:17:50 +0000
Subject: adds the erlang base dir before calling erl

---
 scripts/rabbitmq-defaults | 8 ++++++++
 scripts/rabbitmq-plugins  | 2 +-
 scripts/rabbitmq-server   | 4 ++--
 scripts/rabbitmqctl       | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index 4763f086..f618f584 100644
--- a/scripts/rabbitmq-defaults
+++ b/scripts/rabbitmq-defaults
@@ -18,6 +18,14 @@
 ### next line potentially updated in package install steps
 SYS_PREFIX=
 
+### next line will be updated when generating a standalone release
+ERL_DIR=
+
+### TODO fix these values
+CLEAN_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_clean"
+SASL_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_sasl"
+
+
 ## Set default values
 
 CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index 97c74791..d9347258 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -26,7 +26,7 @@
 
 ##--- End of overridden <var_name> variables
 
-exec erl \
+exec ${ERL_DIR}erl \
     -pa "${RABBITMQ_HOME}/ebin" \
     -noinput \
     -hidden \
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index e1686627..c3d61868 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -82,7 +82,7 @@ case "$(uname -s)" in
 esac
 
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
-if ! erl -pa "$RABBITMQ_EBIN_ROOT" \
+if ! ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
 	    -noinput \
 	    -hidden \
 	    -s rabbit_prelaunch \
@@ -103,7 +103,7 @@ RABBITMQ_LISTEN_ARG=
 # there is no other way of preventing their expansion.
 set -f
 
-exec erl \
+exec ${ERL_DIR}erl \
     -pa ${RABBITMQ_EBIN_ROOT} \
     ${RABBITMQ_START_RABBIT} \
     -sname ${RABBITMQ_NODENAME} \
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index a5fade72..b7351624 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -26,7 +26,7 @@
 
 ##--- End of overridden <var_name> variables
 
-exec erl \
+exec ${ERL_DIR}erl \
     -pa "${RABBITMQ_HOME}/ebin" \
     -noinput \
     -hidden \
-- 
cgit v1.2.1


From 1640bb6af3b1a568de2da9bdf70b983269e2bd63 Mon Sep 17 00:00:00 2001
From: Alvaro Videla <alvaro@rabbitmq.com>
Date: Fri, 9 Nov 2012 10:56:47 +0000
Subject: specifies boot file for erl calls

---
 scripts/rabbitmq-defaults | 6 ++----
 scripts/rabbitmq-plugins  | 1 +
 scripts/rabbitmq-server   | 2 +-
 scripts/rabbitmqctl       | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults
index f618f584..c6923586 100644
--- a/scripts/rabbitmq-defaults
+++ b/scripts/rabbitmq-defaults
@@ -21,10 +21,8 @@ SYS_PREFIX=
 ### next line will be updated when generating a standalone release
 ERL_DIR=
 
-### TODO fix these values
-CLEAN_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_clean"
-SASL_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_sasl"
-
+CLEAN_BOOT_FILE=start_clean
+SASL_BOOT_FILE=start_sasl
 
 ## Set default values
 
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index d9347258..985c7122 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -31,6 +31,7 @@ exec ${ERL_DIR}erl \
     -noinput \
     -hidden \
     -sname rabbitmq-plugins$$ \
+    -boot "${CLEAN_BOOT_FILE}" \
     -s rabbit_plugins_main \
     -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \
     -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index c3d61868..3253bd7b 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -107,7 +107,7 @@ exec ${ERL_DIR}erl \
     -pa ${RABBITMQ_EBIN_ROOT} \
     ${RABBITMQ_START_RABBIT} \
     -sname ${RABBITMQ_NODENAME} \
-    -boot start_sasl \
+    -boot "${SASL_BOOT_FILE}" \
     ${RABBITMQ_CONFIG_ARG} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index b7351624..5471abf7 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -32,6 +32,7 @@ exec ${ERL_DIR}erl \
     -hidden \
     ${RABBITMQ_CTL_ERL_ARGS} \
     -sname rabbitmqctl$$ \
+    -boot "${CLEAN_BOOT_FILE}" \
     -s rabbit_control_main \
     -nodename $RABBITMQ_NODENAME \
     -extra "$@"
-- 
cgit v1.2.1


From 4ebf0a93d4d8188b26da5d148b33d72e446aba96 Mon Sep 17 00:00:00 2001
From: Alvaro Videla <alvaro@rabbitmq.com>
Date: Tue, 26 Feb 2013 17:58:01 +0000
Subject: specifies boot file for rabbit_prelaunch call

---
 scripts/rabbitmq-server | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 3253bd7b..4af38eeb 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -83,6 +83,7 @@ esac
 
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 if ! ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
+            -boot "${CLEAN_BOOT_FILE}" \
 	    -noinput \
 	    -hidden \
 	    -s rabbit_prelaunch \
-- 
cgit v1.2.1