X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=9851fe46350e8538cc37421da45e2d896232d756;hb=90bd397922e7240c41377e7404f79f190bfbc9d8;hp=6389c0466b5ce31d4f602f672c7da95cbbe2755b;hpb=88a54cdff583fe1acdd0e441a331b5fcb570e258;p=distro-setup

diff --git a/brc b/brc
index 6389c04..9851fe4 100644
--- a/brc
+++ b/brc
@@ -343,6 +343,21 @@ bigclock() {
   xclock -digital -update 1 -face 'arial black-80:bold'
 }
 
+bpush() {
+  case $HOSTNAME in
+    tp) target=x2 ;;
+    x2) target=tp ;;
+  esac
+  btrbk-run -t $target && switch-mail-host $HOSTNAME $target
+}
+bpull() {
+  case $HOSTNAME in
+    tp) source=x2 ;;
+    x2) source=tp ;;
+  esac
+  btrbk-run -s $source && switch-mail-host $source $HOSTNAME
+}
+
 btc() {
   local f=/etc/bitcoin/bitcoin.conf
   # importprivkey will timeout if using the default of 15 mins.
@@ -1766,14 +1781,6 @@ tm() {
   (sleep $(calc "$@ * 60") && mpv --no-config --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
 }
 
-tpx2() {
-  case $HOSTNAME in
-    tp) target=x2 ;;
-    x2) target=tp ;;
-  esac
-  btrbk-run -t $target -pv && switch-mail-host $HOSTNAME $target
-}
-
 trg() { transmission-remote-gtk&r; }
 trc() {
   # example, set global upload limit to 100 kilobytes:
@@ -2198,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
@@ -2227,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