From f7e1bcaab381671f9a34bacf762a73773d33ff14 Mon Sep 17 00:00:00 2001 From: Will Farrington Date: Fri, 19 Jul 2013 12:36:27 -0700 Subject: [PATCH] Don't put our xcrun shim on path for 10.9 --- script/bootstrap | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 284b273..e050227 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -15,7 +15,13 @@ set -e rm -rf .bundle/config rm -rf .librarian/puppet/config -# Bundle install unless we're already up to date. +# Put xcrun shim on PATH if on MoLo +set +e +OSX_VERSION_CHECK=`sw_vers | grep ProductVersion | cut -f 2 -d ':' | egrep '10\.8'` +if [ $? -eq 0 ]; then + export PATH=$(pwd)/vendor/shims:$PATH +fi +set -e -export PATH=$(pwd)/vendor/shims:$PATH +# Bundle install unless we're already up to date. /usr/bin/bundle install --binstubs bin --path .bundle --quiet "$@"