Permalink
Browse files

Play nicer with boxen (again).

  • Loading branch information...
1 parent c5b26de commit 57b87d7a1464559b0c7de84576a0c3f05bbdbf73 @MikeMcQuaid committed Jan 6, 2014
Showing with 2 additions and 5 deletions.
  1. +1 −1 bundle/config
  2. +1 −4 shrc.sh
View
@@ -1,2 +1,2 @@
-BUNDLE_BIN: .bundle/bin/
+BUNDLE_BIN: bin/
BUNDLE_PATH: vendor/ruby
View
@@ -54,9 +54,6 @@ field() {
[ -d /opt/boxen ] && source /opt/boxen/env.sh
alias boxen-brew=$BOXEN_HOME/homebrew/bin/brew
-# Stop Boxen's hub alias to git breaking git's zsh completion
-unalias git
-
# Setup paths
remove_from_path() {
[ -d $1 ] || return
@@ -103,7 +100,7 @@ add_to_path_start "/usr/local/sbin"
# Run rbenv if it exists
quiet_which rbenv && add_to_path_start "$(rbenv root)/shims"
-force_add_to_path_start ".bundle/bin"
+force_add_to_path_start "bin"
quiet_which ack-grep && alias ack=ack-grep
export DIFF=diff

0 comments on commit 57b87d7

Please sign in to comment.