X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=6cbc09ac133bc2ce5c2afb0b8e84f2fe1700c031;hb=917ca4a71b5c456b741456dc173c144ee7042d89;hp=08f4e79524f37490c58fb6eb0e2cba933695b18f;hpb=cb16d3950c49e44e40c765db5c50fc4f961fee29;p=distro-setup

diff --git a/brc b/brc
index 08f4e79..6cbc09a 100644
--- a/brc
+++ b/brc
@@ -332,9 +332,10 @@ b() {
   c -
 }
 
-bkrun() {
-  # use -p from interactive shell
-  btrbk-run -p "$@"
+bkr() {
+  # get latest
+  install-my-scripts
+  btrbk-run "$@"
 }
 
 bfg() { java -jar /a/opt/bfg-1.12.14.jar "$@"; }
@@ -2205,27 +2206,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 +2215,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