From 388e36c98bf3efae3a1e25eabdd291f0b5b5e7c9 Mon Sep 17 00:00:00 2001 From: Peter Feiner Date: Thu, 24 Oct 2013 18:51:44 -0400 Subject: [PATCH] zsh openrc compatibility Replacing $BASH_SOURCE with ${BASH_SOURCE:-$0} makes devstack zsh friendly: in bash, $BASH_SOURCE is used per usual; in zsh, where $BASH_SOURCE isn't defined, $0 is used, which, unlike in bash, evaluates to the current source file. Now you can source devstack's openrc from a zsh shell. Tested with bash and zsh from directories other than the root devstack directory. Change-Id: Iab1a817b15d86144163b5094bb58f94b15c598a0 --- eucarc | 2 +- openrc | 2 +- stackrc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eucarc b/eucarc index 2b0f7dd143..350235106c 100644 --- a/eucarc +++ b/eucarc @@ -13,7 +13,7 @@ if [[ -n "$2" ]]; then fi # Find the other rc files -RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd) +RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd) # Get user configuration source $RC_DIR/openrc diff --git a/openrc b/openrc index 3de7e3958f..5344d247bd 100644 --- a/openrc +++ b/openrc @@ -18,7 +18,7 @@ if [[ -n "$2" ]]; then fi # Find the other rc files -RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd) +RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd) # Import common functions source $RC_DIR/functions diff --git a/stackrc b/stackrc index 0151672c1d..4da481e98e 100644 --- a/stackrc +++ b/stackrc @@ -1,7 +1,7 @@ # stackrc # # Find the other rc files -RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd) +RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd) # Destination path for installation DEST=/opt/stack