Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

moves rabbitmq to top level dir

  • Loading branch information...
commit 3fe27cf2496ed7c73bf6fc620f5fcd0b94cf1f5f 1 parent 05da332
@videlalvaro authored
View
10 Makefile
@@ -70,12 +70,9 @@ release: $(RABBITMQ) clean-release-dir
mkdir $(RLS_DIR)/bin
sed 's/%%ERTS_VSN%%/$(ERTS_VSN)/' pre-release/templates/post_install.sh > $(RLS_DIR)/bin/post_install.sh
# add the start_server command
- sed 's/%%VSN%%/$(VERSION)/' pre-release/templates/start_server > $(RLS_DIR)/bin/start_server.tmp
- sed 's/%%ERTS_VSN%%/erts-$(ERTS_VSN)/' $(RLS_DIR)/bin/start_server.tmp > $(RLS_DIR)/bin/start_server
+ sed 's/%%ERTS_VSN%%/erts-$(ERTS_VSN)/' pre-release/templates/start_server > $(RLS_DIR)/bin/start_server
# add the stop_server command
- sed 's/%%VSN%%/$(VERSION)/' pre-release/templates/stop_server > $(RLS_DIR)/bin/stop_server.tmp
- sed 's/%%ERTS_VSN%%/erts-$(ERTS_VSN)/' $(RLS_DIR)/bin/stop_server.tmp > $(RLS_DIR)/bin/stop_server
- rm $(RLS_DIR)/bin/*.tmp
+ sed 's/%%ERTS_VSN%%/erts-$(ERTS_VSN)/' pre-release/templates/stop_server > $(RLS_DIR)/bin/stop_server
# add the start_epmd command
sed 's/%%ERTS_VSN%%/erts-$(ERTS_VSN)/' pre-release/templates/start_epmd > $(RLS_DIR)/bin/start_epmd
chmod +x $(RLS_DIR)/bin/*
@@ -96,6 +93,9 @@ release: $(RABBITMQ) clean-release-dir
ifneq "$(PLUGINS)" ""
echo "[$(PLUGINS)]." > $(RLS_DIR)/etc/rabbitmq/enabled_plugins
endif
+# move rabbit app to top level
+ mv $(RLS_DIR)/lib/rabbit-$(VERSION)/* $(RLS_DIR)/
+ rm -rf $(RLS_DIR)/lib/rabbit-$(VERSION)
# generate final tar
(cd $(RLS_BUILD_DIR); tar -zchf $(TARBALL_NAME)u.tar.gz $(TARBALL_NAME))
mkdir build
View
2  pre-release/templates/rabbitmq-defaults
@@ -16,7 +16,7 @@
##
### next line potentially updated in package install steps
-SYS_PREFIX="${RABBITMQ_HOME}/../.."
+SYS_PREFIX="${RABBITMQ_HOME}"
ERTS_DIR="${SYS_PREFIX}/%%ERTS_VSN%%/bin"
## Set default values
View
10 pre-release/templates/rabbitmq-server
@@ -74,6 +74,11 @@ esac
## start epmd since erlang might fail in a path with spaces
. "${SYS_PREFIX}"/bin/start_epmd
+# redirect erlang output
+exec > ${RABBITMQ_LOG_BASE}/erlang.out
+# clean out file
+echo ""
+
RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
if "${ERTS_DIR}"/erl \
@@ -107,11 +112,6 @@ RABBITMQ_LISTEN_ARG=
set -f
-# redirect erlang output
-exec > ${RABBITMQ_LOG_BASE}/erlang.out
-# clean out file
-echo ""
-
exec "${ERTS_DIR}"/erl \
${RABBITMQ_EBIN_PATH} \
${RABBITMQ_START_RABBIT} \
View
4 pre-release/templates/start_server
@@ -2,14 +2,14 @@
EPMD_ROOT=./%%ERTS_VSN%%/bin
LOG_BASE="./var/log/rabbitmq"
./bin/post_install.sh
-./lib/rabbit-%%VSN%%/sbin/rabbitmq-server
+./sbin/rabbitmq-server
exit_code=1
tries=0
while [ $exit_code -gt 0 ]
do
- grep 'broker running' "${LOG_BASE}"/erlang.out > /dev/null
+ grep 'broker running\|already running' "${LOG_BASE}"/erlang.out > /dev/null
exit_code=$?
# exit after 10 attempts
tries=$((tries+1))
View
2  pre-release/templates/stop_server
@@ -1,7 +1,7 @@
#!/bin/sh
EPMD_ROOT=./%%ERTS_VSN%%/bin
-./lib/rabbit-%%VSN%%/sbin/rabbitmqctl stop > /dev/null
+./sbin/rabbitmqctl stop > /dev/null
exit_code=0
tries=0
Please sign in to comment.
Something went wrong with that request. Please try again.