Commits

Ryan Wilcox committed a68f040

added launchbar search script

Comments (0)

Files changed (3)

bin/launchbar_search.rb

+#!/usr/bin/env ruby
+
+script_in = (STDIN.tty?) ? ARGV[0] : $stdin.read
+`open "x-launchbar:select?string=#{script_in}"`
 [user]
 	name = Ryan Wilcox
-	email = rwilcox@wilcoxd.com
+	email = ryan@fanzter.com
 [core]
-	excludesfile = /Users/aias/.gitignore_global
+	excludesfile = /Users/rwilcox/.gitignore_global
 	filemode = false
 [color]
 	diff = auto
 	pl = pull github master
 	ls = diff --numstat
 [difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	cmd = /usr/local/bin/bbdiff --resume --reverse --wait \"$LOCAL\" \"$REMOTE\"
 	path = 
 [mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	cmd = /Users/rwilcox/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
 [branch]
 	autosetupmerge = true
 #!/usr/bin/env bash
 
-ln -s `pwd`/zshrc.sh ~/.zshrc
+#ln -s `pwd`/zshrc.sh ~/.zshrc
 ln -s `pwd`/aliases.sh ~/.aliases
 ln -s `pwd`/bin ~/bin
 ln -s `pwd`/ctags.sh ~/.ctags