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

diff --git a/brc b/brc
index 487ee8f..99c4e81 100644
--- a/brc
+++ b/brc
@@ -157,6 +157,7 @@ HISTIGNORE='pass *:[ ]*:lom*:gram*'
 
 export BC_LINE_LENGTH=0
 
+export PROFILE_TASKS_TASK_OUTPUT_LIMIT=100
 
 # note, if I use a machine I dont want files readable by all users, set
 # umask 077  # If fewer than 4 digits are entered, leading zeros are assumed
@@ -188,13 +189,14 @@ 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
 path_add --ifexists --end /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-tools
-path_add --ifexists --end /a/opt/scancode-toolkit-2.9.2
+path_add --ifexists --end /a/opt/scancode-toolkit-3.0.2
 export WCDHOME=/a
 # based on readme.debian. dunno if this will break on other distros.
 _x=/usr/share/wcd/wcd-include.sh
@@ -312,7 +314,7 @@ khcopy() {
 }
 
 a() {
-  local x=$(readlink -nf "$@")
+  local x=$(readlink -nf "${1:-$PWD}")
   # yes, its kinda dumb that xclip/xsel cant do this in one invocation
   echo -n "$x" | xclip -selection clipboard
   echo -n "$x" | xclip
@@ -328,6 +330,23 @@ anki() {
   fi
 }
 
+ap() {
+  # pushd in case current directory has an ansible.cfg file
+  pushd /a/xans >/dev/null
+  ansible-playbook -v -l ${1:- $(hostname -f)} site.yml
+  popd >/dev/null
+}
+aw() {
+  pushd /a/work/ansible-configs >/dev/null
+  time ansible-playbook -v -i inventory adhoc.yml "$@"
+  popd >/dev/null
+}
+ad() {
+  pushd /a/bin/distro-setup/a >/dev/null
+  ansible-playbook site.yml
+  popd >/dev/null
+}
+
 astudio() {
   # googling android emulator libGL error: failed to load driver: r600
   # lead to http://stackoverflow.com/a/36625175/14456
@@ -342,9 +361,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,21 +383,22 @@ 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
+  [[ $1 ]] || return 1
+  c /
+  # run latest
+  install-my-scripts
+  switch-mail-host $1 $HOSTNAME
+}
+bpush() {
+  [[ $1 ]] || return 1
+  c /
+  # run latest
+  install-my-scripts
+  switch-mail-host $HOSTNAME $1
 }
 
+
 btc() {
   local f=/etc/bitcoin/bitcoin.conf
   # importprivkey will timeout if using the default of 15 mins.
@@ -593,7 +624,7 @@ envload() { # load environment from a previous: export > file
 
 # mail related
 etail() {
-  sudo tail -f /var/log/exim4/mainlog
+  sudo tail -F /var/log/exim4/mainlog -n 50
 }
 
 f() {
@@ -613,7 +644,7 @@ fa() {
 faf() { # find all files
   find -L $1 -not \( -name .svn -prune -o -name .git -prune \
        -o -name .hg -prune -o -name .editor-backups -prune \
-       -o -name .undo-tree-history -prune \) 2>/dev/null
+       -o -name .undo-tree-history -prune \)  -type f 2>/dev/null
 }
 
 # one that comes with distros is too old for newer devices
@@ -932,7 +963,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 "$@"
 }
 
@@ -1056,6 +1091,8 @@ ifn() {
        -o -name .hg -prune -o -name .editor-backups -prune \
        -o -name .undo-tree-history -prune \) -iname "*$**" 2>/dev/null
 }
+ifnl() {
+}
 
 
 if [[ $OS == Windows_NT ]]; then
@@ -1100,6 +1137,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 +1309,20 @@ pfind() { #find *$1* in $PATH
   find "${pathArray[@]}" -iname "*$1*"
 }
 
+pkx() { # package extract
+  c `mktemp -d`
+  pkg=$1
+  cached=$(ls -t /var/cache/apt/archives/$pkg* | tail -n1)
+  if [[ $cached ]]; then
+    cp $cached .
+  else
+    aptitude download $pkg
+  fi
+  f=(*)
+  ex $f
+  rm -f $f
+}
+
 pk1() {
   local pid
   pid=($(pgrep -f "$*"))
@@ -1368,6 +1420,17 @@ r() {
 rbpipe() { rbt post -o --diff-filename=- "$@"; }
 rbp() { rbt post -o "$@"; }
 
+resolvcat() {
+  local f
+  f=/etc/resolv.conf
+  echo $f:;  ccat $f
+  hr; echo dnsmasq is $(systemctl is-active dnsmasq)
+  f=/var/run/dnsmasq/resolv.conf
+  hr; echo $f:;  ccat $f
+  f=/etc/dnsmasq-servers.conf
+  hr; echo $f:;  ccat $f
+}
+
 rl() {
   # rsync, root is required to keep permissions right.
   # rsync  --archive --human-readable --verbose --itemize-changes --checksum \(-ahvic\) \
@@ -1505,12 +1568,16 @@ srestart() {
     systemctl restart $service
   fi
 }
-serstopnm() {
+stopnm() {
   ser stop NetworkManager
   ser stop dnsmasq
   s resolvconf -d NetworkManager
   ser start dnsmasq
 }
+startnm() {
+  ser start NetworkManager
+  s nmtui-connect
+}
 
 setini() { # set a value in a .ini style file
   key="$1" value="$2" section="$3" file="$4"
@@ -1612,7 +1679,7 @@ splay() { # script replay
   scriptreplay "$1.t" "$1.s"
 }
 
-smeld() { # usage host1 host2 file
+smeld() { # ssh meld usage host1 host2 file
   meld <(ssh $1 cat $3) <(ssh $2 cat $3)
 }
 
@@ -1962,6 +2029,8 @@ xl() {
   xscreensaver-command -activate
 }
 
+xevkb() { xev -event keyboard; }
+
 # * misc stuff
 
 # from curl cheat.sh/:bash_completion
@@ -2085,13 +2154,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 +2189,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)\] "
@@ -2228,7 +2297,11 @@ export GOPATH=$HOME/go
 path_add $GOPATH/bin
 path_add /usr/local/go/bin
 
-export ARDUINO_PATH=/a/opt/Arduino/build/linux/work
+# I have the git repo and a release. either one should work.
+# I have both because I was trying to solve an issue that
+# turned out to be unrelated.
+# ARDUINO_PATH=/a/opt/Arduino/build/linux/work
+export ARDUINO_PATH=/a/opt/arduino-1.8.9
 
 path_add --end ~/.npm-global