X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=84386907d92e1f4f53683068ac70ec77d73d48c5;hb=bcd9ff5509ba8f7d693fa1dfbcd623fc8aa90c72;hp=487ee8f1dae06254b7bc6280e0053d8c18423c3b;hpb=25d20d07292550e8701e33aa409e4947f3075ede;p=distro-setup

diff --git a/brc b/brc
index 487ee8f..8438690 100644
--- a/brc
+++ b/brc
@@ -188,8 +188,9 @@ if [[ $SOE ]]; then
 fi
 
 path_add /a/exe
-# end just because it seems safer
-path_add --end node_modules/.bin
+# add this with absolute paths as needed for better security
+#path_add --end /path/to/node_modules/.bin
+
 # pip3 --user things go here:
 path_add --end ~/.local/bin
 path_add --ifexists --end /a/work/libremanage
@@ -328,6 +329,18 @@ anki() {
   fi
 }
 
+ap() {
+  # pushd in case current directory has an ansible.cfg file
+  pushd /a/xans
+  ansible-playbook -v -l ${1:- $(hostname -f)} site.yml
+  popd
+}
+aw() {
+  pushd /a/work/ansible-configs
+  time ansible-playbook -v -i inventory adhoc.yml "$@"
+  popd
+}
+
 astudio() {
   # googling android emulator libGL error: failed to load driver: r600
   # lead to http://stackoverflow.com/a/36625175/14456
@@ -342,9 +355,20 @@ b() {
 
 bbk() {
   c /
+  local active=true
+  if systemctl is-active btrbk.service; then
+    echo "cron btrbk is already running"
+    return 1
+  fi
+  systemctl is-active btrbk.timer || active=false
+  if $active; then
+    ser disable btrbk.timer
+  fi
   # run latest
   install-my-scripts
-  btrbk-run "$@"
+  if ! btrbk-run "$@" && $active; then
+    ser enable btrbk.timer
+  fi
 }
 
 bfg() { java -jar /a/opt/bfg-1.12.14.jar "$@"; }
@@ -353,19 +377,11 @@ 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
+  c /
+  # run latest
+  install-my-scripts
+  switch-mail-host $1 $HOSTNAMEs
 }
 
 btc() {
@@ -932,7 +948,11 @@ gpg() {
 }
 
 gse() {
-  git send-email --notes '--envelope-sender=<ian@iankelling.org>' \
+  local email=ian@iankelling.org
+  if readlink ~/.mu | grep fsf &>/dev/null; then
+    email=iank@fsf.org
+  fi
+  git send-email --notes "--envelope-sender=<$email>" \
       --suppress-cc=self "$@"
 }
 
@@ -1100,6 +1120,7 @@ jtail() {
   journalctl -n 10000 -f "$@" | jfilter
 }
 jr() { journalctl "$@" | jfilter | less ; }
+jrf() { journalctl -f "$@" | jfilter; }
 
 kff() { # keyboardio firmware flash
   pushd /a/bin/distro-setup/Arduino/Model01-Firmware
@@ -1271,6 +1292,21 @@ pfind() { #find *$1* in $PATH
   find "${pathArray[@]}" -iname "*$1*"
 }
 
+pkx() { # package extract
+  c `mktemp -d`
+  pkg=$1
+  cached=$(ls -t /var/cache/apt/archives/$1* | tail -n1)
+  if [[ $cached ]]; then
+    cp $cached .
+  else
+    aptitude download $pkg
+  fi
+  f=(*)
+  dtrx -m $f
+  dtrx -fr $f
+  rm -f $f
+}
+
 pk1() {
   local pid
   pid=($(pgrep -f "$*"))
@@ -2085,13 +2121,10 @@ if [[ $- == *i* ]]; then
     bind -m vi-command W:shell-forward-word
   fi
 
-  if [[ $SSH_CLIENT ]]; then
+  if [[ $SSH_CLIENT || $SUDO_USER ]]; then
     PS1="\h $PS1"
   fi
 
-
-
-
   prompt-command() {
     local return=$? # this MUST COME FIRST
     local psc pst ps_char ps_color stale_subvol
@@ -2123,6 +2156,9 @@ if [[ $- == *i* ]]; then
     if [[ -e /nocow/btrfs-stale ]] && ((`command ls -AUq /nocow/btrfs-stale|wc -l`)); then
       ps_char="! $ps_char"
     fi
+    if [[ ! $SSH_CLIENT && $MAIL_HOST != $HOSTNAME ]]; then
+      ps_char="@ $ps_char"
+    fi
     PS1="${PS1%"${PS1#*[wW]}"} \[$ps_color\]$ps_char\[$(get_term_color nocolor)\] "
     # emacs completion doesnt like the git prompt atm, so disabling it.
     #PS1="${PS1%"${PS1#*[wW]}"}$(__git_ps1 ' (%s)') \[$ps_color\]$ps_char\[$(get_term_color nocolor)\] "