X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=e85f3094f80daab65dc8460e4097e5b966e08169;hb=0cc08a73110c15c4e7bbb8c8233a6c122c27490e;hp=039fb7ee949281c863321aaaedf5127796d0fbfc;hpb=b48c6a655554a90b9a628882efba7eeecbe49879;p=distro-setup

diff --git a/brc b/brc
index 039fb7e..e85f309 100644
--- a/brc
+++ b/brc
@@ -182,6 +182,8 @@ if [[ -e /a/bin/errhandle/err ]]; then
   err-allow
 fi
 path_add /a/exe
+# end just because it seems safer
+path_add --end node_modules/.bin
 # pip3 --user things go here:
 path_add --end ~/.local/bin
 path_add --ifexists --end /a/work/libremanage
@@ -332,9 +334,10 @@ b() {
   c -
 }
 
-bkrun() {
-  # use -p from interactive shell
-  btrbk-run -p "$@"
+bbk() {
+  # run latest
+  install-my-scripts
+  btrbk-run "$@"
 }
 
 bfg() { java -jar /a/opt/bfg-1.12.14.jar "$@"; }
@@ -343,6 +346,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.
@@ -971,8 +989,10 @@ hrcat() { local f; for f; do [[ -f $f ]] || continue; hr; echo "$f"; cat "$f"; d
 
 # get latest hub and run it
 # main command to use:
-# hub pull-request
-# on first use, you input username/pass and it gets an oath token so you dont have to repeat
+# hub pull-request --no-edit
+# --no-edit means to use the first commit\'s message as the pull request message.
+# Also, you need to use a feature branch, not master in your fork.
+# On first use, you input username/pass and it gets an oath token so you dont have to repeat
 # it\'s at ~/.config/hub
 hub() {
   local up uptar updir p
@@ -1735,8 +1755,8 @@ testexim() {
   # adding -d, etc to COMMONOPTIONS in
   # /etc/default/exim4
   exim -d -t <<'EOF'
-From: root@gnu.org
-To: ian@iankelling.org
+From: ian@iankelling.org
+To: root@lists0p.fsf.org
 Subject: Testing Exim
 
 This is a test message.
@@ -1766,21 +1786,6 @@ tm() {
   (sleep $(calc "$@ * 60") && mpv --no-config --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
 }
 
-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
-}
-
 trg() { transmission-remote-gtk&r; }
 trc() {
   # example, set global upload limit to 100 kilobytes:
@@ -2205,27 +2210,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 +2219,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