Merge pull request #412 from ggtools/master

Fixed SCRIPT_DIR computation when CDPATH is set.
This commit is contained in:
brendandburns 2014-07-11 09:29:01 -07:00
commit 56735fe2ec
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@ set -eu
set -o pipefail set -o pipefail
IFS=$'\n\t' IFS=$'\n\t'
SCRIPT_DIR=$(cd $(dirname $0); pwd) SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
INSTANCE_PREFIX=$1 INSTANCE_PREFIX=$1

View File

@ -23,7 +23,7 @@
# exit on any error # exit on any error
set -e set -e
SCRIPT_DIR=$(cd $(dirname $0); pwd) SCRIPT_DIR=$(CDPATH="" cd $(dirname $0); pwd)
source $SCRIPT_DIR/config.sh source $SCRIPT_DIR/config.sh