@@ -266,6 +266,8 @@ if [ -f ~/.git-completion.bash ]; then
266266fi
267267
268268alias here=' open .'
269+
270+ # ln -s /Applications/MacVim.app/Contents/bin/mvim /usr/local/bin/mvim
269271alias vim=' mvim'
270272
271273# Hack to show the version of an installed perl module.
@@ -900,12 +902,6 @@ PS1="\n\[$COLOR_YELLOW\]\u\[\$(error_test)\]@\[$COLOR_GREEN\]\w\$(${dvcs_functio
900902export GR_HOME=${HOME} /dev
901903export GR_USERNAME=andrew.ray
902904
903- function fixrvm() {
904- source ~ /.rvm/scripts/rvm
905- rvm reload
906- rvm list
907- }
908-
909905function gr_locked_gpg() {
910906 if pgrep -f " gpg --use-agent --no-tty --quiet -o" > /dev/null
911907 then
@@ -943,7 +939,7 @@ if [ -d "$GR_HOME" ]; then
943939 pathadd " ${GR_HOME} /engineering/bin"
944940
945941 # default to aws env
946- aws-environment development
942+ aws-environment || aws-environment development
947943
948944 # allow for pivotal prme command
949945 tracker-environment
@@ -996,7 +992,8 @@ if [[ $(command -v pyenv) ]]; then
996992 fi
997993fi
998994
999- export IPSEC_SECRETS_FILE=/etc/ipsec.secrets
995+ # legacy line? testing removing for new laptop setup and not linux
996+ # export IPSEC_SECRETS_FILE=/etc/ipsec.secrets
1000997export KEY_SUFFIX=grandrounds.com
1001998
1002999# GR
@@ -1123,10 +1120,15 @@ if [ -d "$TRACKER_FLOW_PATH" ]; then
11231120 . " $TRACKER_FLOW_PATH /tracker_completion.bash"
11241121fi
11251122
1126- # RVM
1127- pathadd " $HOME /.rvm/bin" # Add RVM to PATH for scripting
1128- [[ -s " $HOME /.rvm/scripts/rvm" ]] && source " $HOME /.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
1129-
11301123# node modules path
1131- pathadd " ./node_modules/.bin"
1124+ # pathadd "./node_modules/.bin"
1125+
1126+ # Chruby
1127+ source /usr/local/share/chruby/chruby.sh
1128+ source /usr/local/share/chruby/auto.sh
1129+
1130+ # set default chruby https://github.com/postmodern/chruby#default-ruby
1131+ chruby 2.5.1
1132+
1133+ [ -s " $NVM_DIR /bash_completion" ] && \. " $NVM_DIR /bash_completion" # This loads nvm bash_completion
11321134
0 commit comments