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
This commit is contained in:
parent
0c42f25043
commit
388e36c98b
2
eucarc
2
eucarc
@ -13,7 +13,7 @@ if [[ -n "$2" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Find the other rc files
|
# Find the other rc files
|
||||||
RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
|
RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)
|
||||||
|
|
||||||
# Get user configuration
|
# Get user configuration
|
||||||
source $RC_DIR/openrc
|
source $RC_DIR/openrc
|
||||||
|
2
openrc
2
openrc
@ -18,7 +18,7 @@ if [[ -n "$2" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Find the other rc files
|
# Find the other rc files
|
||||||
RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
|
RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)
|
||||||
|
|
||||||
# Import common functions
|
# Import common functions
|
||||||
source $RC_DIR/functions
|
source $RC_DIR/functions
|
||||||
|
2
stackrc
2
stackrc
@ -1,7 +1,7 @@
|
|||||||
# stackrc
|
# stackrc
|
||||||
#
|
#
|
||||||
# Find the other rc files
|
# Find the other rc files
|
||||||
RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
|
RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)
|
||||||
|
|
||||||
# Destination path for installation
|
# Destination path for installation
|
||||||
DEST=/opt/stack
|
DEST=/opt/stack
|
||||||
|
Loading…
Reference in New Issue
Block a user