Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 3 commits
  • 4 files changed
  • 0 comments
  • 1 contributor
Dec 02, 2011
Removed RVM, other fixes fe914f6
Turned on rerere a886006
Changed guifont b09dd84
22  bash_profile
@@ -9,17 +9,21 @@ fi
9 9
 
10 10
 # User specific environment and startup programs
11 11
 
  12
+OOYALA_CODE_ROOT=~/repos/ooyala
  13
+OO_DEPLOY_DIR=$HOME/ooyala_deploy
  14
+OIS_ROOT=$HOME/repos/ois
  15
+HADOOP_HOME=$OOYALA_CODE_ROOT/vendor/hadoop_distros/current
12 16
 PATH=$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/local/sbin:/usr/local/graphviz-2.14/bin:$PATH
13 17
 
14 18
 # Conditional additions
15 19
 if [ -d /Developer/Tools ];then
16  
-    export PATH=$PATH:/Developer/Tools:/Developer/usr/bin:/Developer/usr/sbin
  20
+  PATH=$PATH:/Developer/Tools:/Developer/usr/bin:/Developer/usr/sbin
17 21
 fi
18 22
 if [ -d /opt/local/bin ]; then
19  
-	export PATH=$PATH:/opt/local/bin
  23
+	PATH=$PATH:/opt/local/bin
20 24
 fi
21 25
 if [ -d /opt/local/sbin ]; then
22  
-	export PATH=$PATH:/opt/local/sbin
  26
+	PATH=$PATH:/opt/local/sbin
23 27
 fi
24 28
 
25 29
 BASH_ENV=$HOME/.bashrc
@@ -32,7 +36,7 @@ if [ -d ~/.bash_completion.d ]; then
32 36
 fi
33 37
 
34 38
 
35  
-export BASH_ENV ENV PATH PS1 DISPLAY
  39
+export BASH_ENV ENV PATH PS1 DISPLAY OOYALA_CODE_ROOT OIS_DEPLOY_DIR OIS_ROOT HADOOP_HOME
36 40
 
37 41
 # Do OS-specific stuff
38 42
 uname=$(uname)
@@ -67,17 +71,15 @@ if [ -f /opt/local/etc/bash_completion ]; then
67 71
   . /opt/local/etc/bash_completion
68 72
 fi
69 73
 
70  
-export OOYALA_CODE_ROOT=~/repos/ooyala
71 74
 export RUBYOPT="-I. -rubygems"
72 75
 if [ `which mysql_config`x != "x" ]; then
73 76
   export MYSQL_UNIX_PORT=`mysql_config --socket`
74 77
 fi
75  
-export HADOOP_HOME=$OOYALA_CODE_ROOT/vendor/hadoop_distros/current
76  
-export PATH=$PATH:$HADOOP_HOME/bin:$OOYALA_CODE_ROOT/hadoop/tools
77 78
 if [ -x /usr/libexec/java_home ]; then
78 79
   export JAVA_HOME=`/usr/libexec/java_home`
79 80
 fi
80 81
 
81  
-rvm_kill () {
82  
-    ps ax|grep rvm |grep -v grep|awk '{print $1}'|xargs kill -9
83  
-}
  82
+export PATH=$HOME/.rbenv/bin:$HADOOP_HOME/bin:$OOYALA_CODE_ROOT/hadoop/tools:$PATH
  83
+
  84
+eval "$(rbenv init -)"
  85
+
8  bashrc
@@ -14,7 +14,6 @@ PS1="\[\033[1;36m\]\t [\u@\h \W]\$ \[\033[0m\]"
14 14
 # Environment variables
15 15
 HAVE_DOT=YES
16 16
 DOT_PATH=/usr/local/graphviz-2.14/bin
17  
-OOYALA_CODE_ROOT=$HOME/repos/ooyala
18 17
 
19 18
 # User specific aliases and functions
20 19
 alias kinit='/usr/bin/kinit -l7days'
@@ -24,10 +23,3 @@ if [ -f "$HOME/.aws/dev_credentials" ]; then
24 23
   source $HOME/.aws/dev_credentials
25 24
 fi
26 25
 
27  
-if [ -f "$HOME/.rvm/scripts/rvm" ]; then
28  
-  [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
29  
-fi
30  
-
31  
-if [ -f "/usr/local/rvm/scripts/rvm" ]; then
32  
-  [[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm" # Load RVM function
33  
-fi
2  gitconfig
@@ -23,3 +23,5 @@
23 23
 	recurseSubmodules = true
24 24
 [push]
25 25
 	default = tracking
  26
+[rerere]
  27
+	enabled = 1
2  vimrc
@@ -104,7 +104,7 @@ command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
104 104
 colorscheme darkblue
105 105
 
106 106
 " set font
107  
-set guifont=Courier\ New:h12
  107
+set guifont=Bitstream\ Vera\ Sans\ Mono:h12
108 108
 
109 109
 " set guioptions
110 110
 set guioptions-=m " turn off menu bar

No commit comments for this range

Something went wrong with that request. Please try again.