Merge pull request #32 from brson/next

Don't break when CDPATH is set. Fixes #31

1 files changed, 8 insertions, 3 deletions

diff --git a/gen-installer.sh b/gen-installer.sh
index 3155ed2..8c8cc7d 100755
--- a/gen-installer.sh
+++ b/gen-installer.sh
@@ -204,6 +204,13 @@ validate_opt () {
     done
 }
 
+abs_path() {
+    local path="$1"
+    # Unset CDPATH because it causes havok: it makes the destination unpredictable
+    # and triggers 'cd' to print the path to stdout.
+    (unset CDPATH && cd "$path" && pwd)
+}
+
 msg "looking for programs"
 msg
 
@@ -256,9 +263,7 @@ fi
 step_msg "validating arguments"
 validate_opt
 
-# Redirect output of cd command, as it can display the new path when
-# CDPATH is set in bash (which is used for /bin/sh, at least on OS X).
-src_dir="$(cd $(dirname "$0") > /dev/null && pwd)"
+src_dir="$(abs_path $(dirname "$0"))"
 
 rust_installer_version=`cat "$src_dir/rust-installer-version"`