components/rabbitmq/patches/env.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 21 Oct 2013 23:00:28 -0700
branchs11-update
changeset 2798 4504a5420685
parent 2785 b6f5c5d1d0b7
permissions -rw-r--r--
Added tag s11u2-26 for changeset 1456c0bc0212
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2785
b6f5c5d1d0b7 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
b6f5c5d1d0b7 PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
the same directory.
b6f5c5d1d0b7 PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
b6f5c5d1d0b7 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
b6f5c5d1d0b7 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
b6f5c5d1d0b7 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 @@
b6f5c5d1d0b7 PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
     fi
b6f5c5d1d0b7 PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
 done
b6f5c5d1d0b7 PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 
b6f5c5d1d0b7 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`
b6f5c5d1d0b7 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`}
b6f5c5d1d0b7 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}/.."
b6f5c5d1d0b7 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`
b6f5c5d1d0b7 PSARC 2013/140 greenlet version 0.4.0 - Python coroutines module
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
 NODENAME=rabbit@${HOSTNAME%%.*}