more workarounds for apple's stupid default git client

This commit is contained in:
John Bintz 2012-07-24 11:07:42 -04:00
parent 10be919b0a
commit 01ac9bf14e
3 changed files with 31 additions and 1 deletions

View File

@ -1,3 +1,3 @@
module Penchant module Penchant
VERSION = "0.2.12" VERSION = "0.2.13"
end end

View File

@ -7,6 +7,18 @@ if [ ! -z "$MY_RUBY_HOME" ]; then
PATH="$MY_RUBY_HOME/bin:$PATH" PATH="$MY_RUBY_HOME/bin:$PATH"
fi fi
if [ ! -z "$GEM_PATH" ]; then
oifs="$IFS"
while IFS=":" read -ra GEM_PATHS; do
FIXED_GEM_PATH=""
for i in "${GEM_PATHS[@]}"; do
FIXED_GEM_PATH="$FIXED_GEM_PATH:${i}/bin"
done
done <<< "$GEM_PATH"
IFS="$oifs"
PATH="$FIXED_GEM_PATH:$PATH"
fi
if [[ "${msg}" != *"[ci skip]"* ]]; then if [[ "${msg}" != *"[ci skip]"* ]]; then
bundle exec rake --trace bundle exec rake --trace
R=$? R=$?

View File

@ -4,6 +4,24 @@ msg=$(cat $1)
OLD_GIT_DIR=$GIT_DIR OLD_GIT_DIR=$GIT_DIR
# lion appears to insert git paths before everything else. ensure rvm can
# bust through, at the very least.
if [ ! -z "$MY_RUBY_HOME" ]; then
PATH="$MY_RUBY_HOME/bin:$PATH"
fi
if [ ! -z "$GEM_PATH" ]; then
oifs="$IFS"
while IFS=":" read -ra GEM_PATHS; do
FIXED_GEM_PATH=""
for i in "${GEM_PATHS[@]}"; do
FIXED_GEM_PATH="$FIXED_GEM_PATH:${i}/bin"
done
done <<< "$GEM_PATH"
IFS="$oifs"
PATH="$FIXED_GEM_PATH:$PATH"
fi
if [[ "${msg}" != *"[ci skip]"* ]]; then if [[ "${msg}" != *"[ci skip]"* ]]; then
if [ "$(penchant gemfile-env)" != "remote" ]; then if [ "$(penchant gemfile-env)" != "remote" ]; then
unset GIT_DIR unset GIT_DIR