components/rabbitmq/patches/env.patch
author Sean Wilcox <sean.wilcox@oracle.com>
Tue, 20 Oct 2015 05:38:14 -0700
changeset 4983 db2589571faa
parent 1484 01108fd9c6ef
permissions -rw-r--r--
21480249 create --source-volid should clone the volume w/o blocking the delete of source
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1484
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This allows us to source rabbitmq-env from a script that doesn't live in
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
the same directory.
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
--- rabbitmq-server-2.8.7/scripts/rabbitmq-env	Thu Sep 27 04:08:40 2012
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
+++ rabbitmq-server-2.8.7/scripts/rabbitmq-env	Mon Nov  5 11:10:09 2012
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
@@ -32,7 +32,7 @@
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
     fi
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
 done
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
-SCRIPT_DIR=`dirname $SCRIPT_PATH`
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
+SCRIPT_DIR=${SCRIPT_DIR:-`dirname $SCRIPT_PATH`}
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
 RABBITMQ_HOME="${SCRIPT_DIR}/.."
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
 [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname`
01108fd9c6ef PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
 NODENAME=rabbit@${HOSTNAME%%.*}