Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'relevance/master'

* relevance/master:
  Gemfile for the bundler y'all
  Adding Tyler and Brian
  Incude *.md as well to get extra markdown love
  Be explicit and show if you are solo in your prompt
  Fixing bug that creates extraneous tilde directories when using leopard_ruby with ruby_switcher.sh
  Added Shay to the pair script.
  [ruby_switcher] Update REE 1.8.7 from v20090928 to v2009.10
  Added Chris & David to the pair script.
  Adding back Corey as "ca"; more cleanup; add exports.sh
  etc cleanup:
  1.8.7 should use its own gems not 1.8.6 ones
  REE 1.8.7 as contributed by tcocca
  Include *.watchr files w/ rmate for http://github.com/mynyml/watchr/

Conflicts:
	bash/gemdoc.sh
	bash/rails.sh
	bash/ruby_switcher.sh
  • Loading branch information...
commit 42494b2972d6174b7930c4dc695f3a9d90665b19 2 parents d71355b + cb05c44
Darrick Wiebe authored
View
22 bash/aliases.sh
@@ -5,7 +5,6 @@ alias rm='rm -i'
alias :='cd ..'
alias ::='cd ../..'
alias :::='cd ../../..'
-alias v='vmstat'
alias md=mkdir
# Need to do this so you use backspace in screen...I have no idea why
@@ -17,35 +16,14 @@ alias ltr='ls -ltr'
alias lth='l -t|head'
alias lh='ls -Shl | less'
alias tf='tail -f -n 100'
-alias t500='tail -n 500'
-alias t1000='tail -n 1000'
-alias t2000='tail -n 2000'
-
-# svn
-alias sup='svn up'
-alias sst='svn st'
-alias sstu='svn st -u'
-alias sci='svn ci -m'
-alias sdiff='svn diff | colordiff'
-alias smate='svn diff | mate && svn ci'
-alias sadd="sst | grep '?' | cut -c5- | xargs svn add"
# editing shortcuts
alias m='mate'
alias e='emacs'
alias erc='e /etc/bashrc'
alias newrc='. /etc/bashrc'
-alias rsync_nosvn="rsync --exclude=.svn -r "
alias rsync_novc="rsync --exclude=.svn --exclude=.git -r "
-alias sourceit='. ~/src/scripts/profile.d/00_startup.sh'
-
-# mate shortcuts
-alias m8prof='m ~/src/scripts/profile.d/'
-
-# ignore svn metadata - pipe this into xargs to do stuff
-alias no_svn="find . -path '*/.svn' -prune -o -type f -print"
-
# grep for a process
function psg {
FIRST=`echo $1 | sed -e 's/^\(.\).*/\1/'`
View
18 bash/exports.sh
@@ -0,0 +1,18 @@
+# Set default console Java to 1.6
+export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
+
+export CLICOLOR=1
+export LSCOLORS=gxfxcxdxbxegedabagacad
+
+# Enable color in grep
+export GREP_OPTIONS='--color=auto'
+export GREP_COLOR='3;33'
+
+# This resolves issues install the mysql, postgres, and other gems with native non universal binary extensions
+# You only want this if you are on Snow Leopard
+export ARCHFLAGS='-arch x86_64'
+
+# History: don't store duplicates
+export HISTCONTROL=erasedups
+# History: 10,000 entries
+export HISTSIZE=10000
View
14 bash/gemdoc.sh
@@ -1,14 +0,0 @@
-alias gems='pushd $(gem env gemdir)/gems'
-
-export GEMDIR=`gem env gemdir`
-
-gemdoc() {
- open $GEMDIR/doc/`$(which ls) $GEMDIR/doc | grep $1 | sort | tail -1`/rdoc/index.html
-}
-
-_gemdocomplete() {
- COMPREPLY=($(compgen -W '$(`which ls` $GEMDIR/doc)' -- ${COMP_WORDS[COMP_CWORD]}))
- return 0
-}
-
-complete -o default -o nospace -F _gemdocomplete gemdoc
View
2  bash/git_prompt.sh
@@ -54,7 +54,7 @@ function git_branch_and_user {
#
# git config --global user.initials 'jr'
function git_user_initials {
- git config --get user.initials
+ git config --get user.initials || echo "-solo-"
}
function git_base_dir {
View
23 bash/ruby_switcher.sh
@@ -3,7 +3,7 @@ export ORIGINAL_PATH=$PATH
function use_leopard_ruby {
export MY_RUBY_HOME=/System/Library/Frameworks/Ruby.framework/Versions/Current/usr
export GEM_HOME=~/.gem/ruby/1.8
- export GEM_PATH="~/.gem/ruby/1.8:/Library/Ruby/Gems/1.8:/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/gems/1.8"
+ export GEM_PATH=~/.gem/ruby/1.8:/Library/Ruby/Gems/1.8:/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/gems/1.8
export RUBY_VER=leopard_ruby
update_path
}
@@ -136,6 +136,23 @@ function install_ree_186 {
popd
}
+function use_ree_187 {
+ export MY_RUBY_HOME=~/.ruby_versions/ruby-enterprise-1.8.7-2009.10
+ export GEM_HOME=~/.gem/ruby/1.8.7
+ export GEM_PATH=~/.gem/ruby/1.8.7
+ update_path
+}
+
+function install_ree_187 {
+ mkdir -p ~/tmp && mkdir -p ~/.ruby_versions && pushd ~/tmp
+ curl --silent -L -O http://rubyforge.org/frs/download.php/66162/ruby-enterprise-1.8.7-2009.10.tar.gz &&
+ tar xzf ruby-enterprise-1.8.7-2009.10.tar.gz && cd ruby-enterprise-1.8.7-2009.10 &&
+ ./installer -a $HOME/.ruby_versions/ruby-enterprise-1.8.7-2009.10 --dont-install-useful-gems &&
+ cd ~/tmp && rm -rf ~/tmp/ruby-enterprise-1.8.7-2009.10 ruby-enterprise-1.8.7-2009.10.tar.gz &&
+ use_ree_187 && install_rake &&
+ popd
+}
+
function use_ruby_191 {
export MY_RUBY_HOME=~/.ruby_versions/ruby-1.9.1-p243
export GEM_HOME=~/.gem/ruby/1.9.1
@@ -181,8 +198,8 @@ function use_ruby_187_and_jruby {
function use_ruby_187 {
export MY_RUBY_HOME=~/.ruby_versions/ruby-1.8.7-p174
- export GEM_HOME=~/.gem/ruby/1.8
- export GEM_PATH=~/.gem/ruby/1.8
+ export GEM_HOME=~/.gem/ruby/1.8.7
+ export GEM_PATH=~/.gem/ruby/1.8.7
export RUBY_VER=1.8.7
export INCLUDE_JRUBY=false
update_path
View
8 scripts/pair
@@ -15,7 +15,10 @@ PAIR_EMAIL = "pair@thinkrelevance.com"
AUTHORS = {
"ab" => "Aaron Bedra",
+ "ca" => "Corey Haines",
"ch" => "Chad Humphries",
+ "cr" => "Chris Redinger",
+ "dc" => "David Chelimsky",
"dm" => "Don Mullen",
"gv" => "Glenn Vanderburg",
"jm" => "Jess Martin",
@@ -25,7 +28,10 @@ AUTHORS = {
"ma" => "Muness Alrubaie",
"na" => "Nick Ang",
"rs" => "Rob Sanheim",
- "sh" => "Stuart Halloway"
+ "sf" => "Shay Frendt",
+ "sh" => "Stuart Halloway",
+ "tj" => "Tyler Jennings",
+ "bm" => "Brian Marick"
}
## End of configuration
Please sign in to comment.
Something went wrong with that request. Please try again.