various bug fixes

[distro-setup] / brc

diff --git a/brc b/brc
index 08f4e79524f37490c58fb6eb0e2cba933695b18f..9851fe46350e8538cc37421da45e2d896232d756 100644 (file)
--- a/brc
+++ b/brc
@@ -2205,27 +2205,7 @@ fi
 #  eval "$(pyenv virtualenv-init -)"
 #fi
 
-# id prefer to have system-wide, plus user ruby, due to bug in it
-# https://github.com/rubygems/rubygems/pull/1002
-# further problems: installing multi-user ruby and user ruby,
-# you dont get multi-user ruby when you sudo to root, unless its sudo -i.
-# There a third hybrid form, which passenger error suggested I use,
-# but it didnt actually work.
-
-# in cased I never need this
-# rvm for non-interactive shell: modified from https://rvm.io/rvm/basics
-#if [[ $(type -t rvm) == file && ! $(type -t ruby) ]]; then
-#    source $(rvm 1.9.3 do rvm env --path)
-#fi
-
-# based on warning from rvmsudo
-export rvmsudo_secure_path=1
 
-if [[ -s "/usr/local/rvm/scripts/rvm" ]]; then
-  source "/usr/local/rvm/scripts/rvm"
-elif [[ -s $HOME/.rvm/scripts/rvm ]]; then
-  source $HOME/.rvm/scripts/rvm
-fi
 
 export GOPATH=$HOME/go
 path_add $GOPATH/bin
@@ -2234,6 +2214,10 @@ export ARDUINO_PATH=/a/opt/Arduino/build/linux/work
 
 path_add --end ~/.npm-global
 
+# taken from default changes to bashrc and bash_profile
+path_add --end $HOME/.rvm/bin
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+
 export BASEFILE_DIR=/a/bin/fai-basefiles
 
 # didnt get drush working, if I did, this seems like the