Merge branch 'cdpath-enable'

This commit is contained in:
Mislav Marohnić 2017-11-29 15:53:41 +01:00
commit eda952ab08

View file

@ -1,6 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
unset CDPATH
if [ "$1" = "--debug" ]; then if [ "$1" = "--debug" ]; then
export RBENV_DEBUG=1 export RBENV_DEBUG=1
@ -60,6 +59,7 @@ export RBENV_ROOT
if [ -z "${RBENV_DIR}" ]; then if [ -z "${RBENV_DIR}" ]; then
RBENV_DIR="$PWD" RBENV_DIR="$PWD"
else else
[[ $RBENV_DIR == /* ]] || RBENV_DIR="$PWD/$RBENV_DIR"
cd "$RBENV_DIR" 2>/dev/null || abort "cannot change working directory to \`$RBENV_DIR'" cd "$RBENV_DIR" 2>/dev/null || abort "cannot change working directory to \`$RBENV_DIR'"
RBENV_DIR="$PWD" RBENV_DIR="$PWD"
cd "$OLDPWD" cd "$OLDPWD"