summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Videla <alvaro@rabbitmq.com>2012-11-07 16:17:50 +0000
committerAlvaro Videla <alvaro@rabbitmq.com>2012-11-07 16:17:50 +0000
commit403786326c589a18968f2d3d1cb318e5a09a52b8 (patch)
tree2cced37a4d43d4e4982ce461a2a16c3f472f4afe
parentfbe7832f5486a155cff5ddab2eea3fadcd039cf4 (diff)
downloadrabbitmq-server-403786326c589a18968f2d3d1cb318e5a09a52b8.tar.gz
adds the erlang base dir before calling erl
-rw-r--r--scripts/rabbitmq-defaults8
-rwxr-xr-xscripts/rabbitmq-plugins2
-rwxr-xr-xscripts/rabbitmq-server4
-rwxr-xr-xscripts/rabbitmqctl2
4 files changed, 12 insertions, 4 deletions
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 \