rename err to bash-bear

diff --git a/brc b/brc
index 742dcee0e958267a4fbb7856b86509eae08bd948..5aff8e034848cbbfb816f6cd54d65d2055ecd0e7 100644 (file)
--- a/brc
+++ b/brc
@@ -7,15 +7,15 @@
 # so this can set extdebug and avoid the bash debugger.
 
 
-if [[ -s /a/bin/errhandle/err ]]; then
-  # shellcheck source=/a/bin/errhandle/err
-  source /a/bin/errhandle/err
+if [[ -s /a/bin/bash-bear-trap/bash-bear ]]; then
+  # shellcheck source=/a/bin/bash-bear-trap/bash-bear
+  source /a/bin/bash-bear-trap/bash-bear
   # wtf, shellcheck doesn't allow disabling warnings in elifs
 else
   # bleh shellcheck can't handle disabling in an elif, so nesting this if.
   # shellcheck disable=SC2154 # set in .bashrc
   if [[ -s $bashrc_dir/err ]]; then
-    # shellcheck source=/a/bin/errhandle/err
+    # shellcheck source=/a/bin/bash-bear-trap/bash-bear
     source $bashrc_dir/err
   fi
 fi
@@ -282,8 +282,8 @@ fi
 # bash: /usr/share/bashdb/bashdb-main.inc: No such file or directory
 # bash: warning: cannot start debugger; debugging mode disabled
 if [[ $SOE ]]; then
-  if [[ -e /a/bin/errhandle/err ]]; then
-    source /a/bin/errhandle/err
+  if [[ -e /a/bin/bash-bear-trap/bash-bear ]]; then
+    source /a/bin/bash-bear-trap/bash-bear
   fi
 fi
 
@@ -561,6 +561,21 @@ bl() {
     fi
   done
 }
+# like running cl <enter> a <enter>
+cla() {
+  local line
+  mapfile -t lines <~/.cdirs
+  start=$(( ${#lines[@]} - 1 ))
+  for (( j=start; j >= 0; j-- )); do
+    line="${lines[$j]}"
+    if [[ ! $line || ! -d "$line" || $line == "$PWD" || line == "$HOME"  ]]; then
+      continue
+    fi
+    e "$line"
+    c "$line"
+    break
+  done
+}
 ## END functions to change directory better than cd ##
 
 # pee do. run args as a command with output copied to syslog.
@@ -818,15 +833,15 @@ cf() {
 caf() {
 
   local file
-find -L "$@" -type f -not \( -name .svn -prune -o -name .git -prune \
+  find -L "$@" -type f -not \( -name .svn -prune -o -name .git -prune \
        -o -name .hg -prune -o -name .editor-backups -prune \
        -o -name .undo-tree-history -prune \) -printf '%h\0%d\0%p\n' | sort -t '\0' -n \
-  | awk -F '\0' '{print $3}' 2>/dev/null | while read -r file; do
+    | awk -F '\0' '{print $3}' 2>/dev/null | while read -r file; do
     hr
     printf "%s\n" "$file"
     hr
     cat "$file"
-done
+  done
 }
 ccomp cat cf caf
 
@@ -840,7 +855,7 @@ clc() {
 
 cx() {
   chmod +X "$@"
-  }
+}
 
 cam() {
   git commit -am "$*"
@@ -1436,6 +1451,18 @@ g() {
   fi
 }
 
+# g pipe. like: cmd | emacs. save cmd output to tmp file, then edit.
+gp() {
+  cat &>/a/tmp/gtmp
+  g "$@" /a/tmp/gtmp
+  }
+
+# like cmd &> tempfile; emacs tempfile
+gc() {
+  "$@" &> /a/tmp/gtmp
+  g /a/tmp/gtmp
+  }
+
 # force terminal version
 gn() {
   g -n "$@"
@@ -2030,6 +2057,8 @@ sedi() {
   sed -i --follow-symlinks "$@"
 }
 
+
+
 rmstrips() {
   ssh fencepost head -n 300 /gd/gnuorg/EventAndTravelInfo/rms-current-trips.txt | less
 }

diff --git a/brc2 b/brc2
index 3f62206fe633c812068b552d83d6d6d1e67120c5..af4d8082aaa92268c4f0f9daa5e10e6501be15c5 100644 (file)
--- a/brc2
+++ b/brc2
@@ -439,22 +439,19 @@ astudio() {
 # Convert brains file path to url and vice versa
 # usage: brains [URL_OR_PATH]
 brains() {
-  _iki-convert '(/a)?/f/brains' brains.fsf.org/wiki "$@"
+  _iki-convert brains.fsf.org/wiki "$@"
 }
 glue() {
-  _iki-convert '(/a)?/f/gluestick' gluestick.office.fsf.org "$@"
+  _iki-convert gluestick.office.fsf.org "$@"
 }
 
-# usage: $0 REPO_PATH [URL_OR_PATH]
+# usage: see above
 _iki-convert() {
-  local url prefix path input err repo_dir dir url_dir url
-  repo_dir="$1"
-  prefix="$2"
-  shift 2
-  err=false
-  if $err; then
-    return 1
-  fi
+  local url url_prefix path input err repo_dir dir url_dir url name
+  url_prefix="$1"
+  name="${url_prefix%%.*}"
+  repo_dir="/f/$name"
+  shift
   if [[ $1 ]]; then
     input="$*"
   else
@@ -462,7 +459,7 @@ _iki-convert() {
   fi
   case $input in
     http*)
-      path="$repo_dir/${input##http*://"$prefix"/}"
+      path="$repo_dir/${input##http*://"$url_prefix"/}"
       if [[ $path == */ ]]; then
         path=${path%/}.mdwn
       fi
@@ -470,8 +467,8 @@ _iki-convert() {
       ;;
     *)
       path=$(fp "$input")
-      url_dir=$(echo "$path" | sed -r "s,^$repo_dir/,,")
-      url="https://$prefix/$url_dir"
+      url_dir=$(echo "$path" | sed -r "s,^(/a)?$repo_dir/,,")
+      url="https://$url_prefix/$url_dir"
       url="${url%.mdwn}/"
       j echo "$url"
       ;;
@@ -744,7 +741,7 @@ mpvrpc-percent-pos() {
 # q quit
 # ret next
 #
-beetag() {
+beetag()  {
   local last_genre_i fstring tag id char new_item char_i genre tag remove doplay i j random path
   local do_rare_genres read_wait help line lsout tmp ls_line skip_lookback
   local escape_char escaped_input expected_input skip_input_regex right_pad erasable_line seek_sec
@@ -2982,6 +2979,35 @@ prof-recent-local() {
   done
 }
 
+prof-sort() {
+  case $HOSTNAME in
+    kd)
+      prof-recent-sort
+      ;;
+    *)
+      ssh b8.nz prof-recent-sort
+      ;;
+  esac
+}
+
+prof-recent-sort() {
+  local d dates date files f
+  # consider making the day count passed by parameter. note: this works: $(date -d '2 day ago' +%Y_%m_%d)
+  dates=("$(date +%Y_%m_%d)" "$(date -d '1 day ago' +%Y_%m_%d)" )
+  files=()
+  for d in /d/p/profanity/chatlogs/iank_at_fsf.org/!(rooms); do
+    for date in ${dates[@]}; do
+      f=$d/$date.log
+      if [[ -e $f ]]; then
+        files+=($f)
+      fi
+    done
+  done
+  for f in "${files[@]}"; do
+    sed "s/\$/ $f/" $f
+  done | sort
+}
+
 
 # usage: debvm DEBIAN_VERSION RAM_MB
 debvm() {
@@ -4062,13 +4088,18 @@ fi
 # rg with respecting vcs ignore files
 rgv() {
   ret=0
+  # settings that are turned off for pipes, keep them on.
+  # Found by searching for "terminal" in --help
+  # --heading
+  # -n
+  #
   # -. = search dotfiles
   # -z = search zipped files
   # -i = case insensitive
   # -M = max columns
   # --no-messages because of annoying errors on broken symlinks
   # --no-ignore-parent because i have /a/.git which ignores almost everything under it.
-  command rg -. -z --no-messages -i -M 900 --no-ignore-parent -g '!.git' -g '!auto-save-list' -g '!.savehist' "$@" || ret=$?
+  command rg -n --heading -. -z --no-messages -i -M 900 --no-ignore-parent -g '!.git' -g '!auto-save-list' -g '!.savehist' "$@" || ret=$?
   return $ret
 }
 

diff --git a/btrbk-run b/btrbk-run
index c4d84616a9c3427391e9a095e65ccd14d369bcac..bf5117865368a98b0fe2dfc8bd0c2396ca4a30cc 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -22,7 +22,7 @@
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 usage() {
   cat <<'EOF'
@@ -259,7 +259,7 @@ if ! $force && { $check_installed || [[ ! $source ]]; } ; then
       uninstalled-file-die $f
     fi
   done
-  if ! diff -q /a/bin/errhandle/err /usr/local/lib/err; then
+  if ! diff -q /a/bin/bash-bear-trap/bash-bear /usr/local/lib/bash-bear; then
     uninstalled-file-die err
   fi
   if $check_installed; then
@@ -502,7 +502,7 @@ done
 if ! $pull_reexec && [[ $source ]] && $pulla ; then
   tmpf=$(mktemp)
   m rsync -ra $source:/usr/local/bin/{mount-latest-subvol,check-subvol-stale} /usr/local/bin
-  m rsync -ra $source:/usr/local/lib/err /usr/local/lib
+  m rsync -ra $source:/usr/local/lib/bash-bear /usr/local/lib
   m scp $source:/a/bin/distro-setup/btrbk-run $tmpf
   if ! diff -q $tmpf ${BASH_SOURCE[0]}; then
     e "found different version on host $source. reexecing"

diff --git a/btrbkr2 b/btrbkr2
index 321948cd65b6b3f9c1ea3688531bf59963253b9d..f306d39d9d92072413721a81b01d654fecbe65f8 100755 (executable)
--- a/btrbkr2
+++ b/btrbkr2
@@ -4,14 +4,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-License-Identifier: Apache-2.0
 
-if ! test "$BASH_VERSION"; then echo "error: shell is not bash" >&2; exit 1; fi
-shopt -s inherit_errexit 2>/dev/null ||: # ignore fail in bash < 4.4
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" exit status: $?, PIPESTATUS: ${PIPESTATUS[*]}" >&2' ERR
-# alternatively, using https://iankelling.org/git/?p=errhandle;a=tree
-# source /path/errhandle/err
-# on my machine
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 

diff --git a/btrfsmaint b/btrfsmaint
index 0a36d05bb2ba477854cd80b9fbe633d0c9776d6a..c35004ef2fc7e5bb18c5142ab266390327f94053 100755 (executable)
--- a/btrfsmaint
+++ b/btrfsmaint
@@ -3,7 +3,7 @@
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 # inspired from
 # https://github.com/kdave/btrfsmaintenance

diff --git a/check-radicale b/check-radicale
index bf0729cb26fbaa27dd9a76b75a495b9f0955ef36..99599a51ce86cc9e130ec5e6aa3fa305d17cda70 100755 (executable)
--- a/check-radicale
+++ b/check-radicale
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 source /a/bin/bash_unpublished/source-state
 if [[ $HOSTNAME != "$MAIL_HOST" ]]; then

diff --git a/check-remote-mailqs b/check-remote-mailqs
index fa3dbf8e6e90e18c4063eb6b41a62075bbbcdf6f..047e8b7ccae997a5a77451a40b0f036387cfcf15 100755 (executable)
--- a/check-remote-mailqs
+++ b/check-remote-mailqs
@@ -4,7 +4,7 @@
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 shopt -s nullglob
 shopt -s dotglob

diff --git a/check-subvol-stale b/check-subvol-stale
index fbd31d6af4f3bbb9cbdcb8e7ff8597f064233955..5ae7cb6b52996305e2eed53aa731777eff455d66 100644 (file)
--- a/check-subvol-stale
+++ b/check-subvol-stale
@@ -16,7 +16,7 @@
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 shopt -s nullglob
 

diff --git a/conflink b/conflink
index 855014377e8c74edc177e8906eede0787946d1d8..d661e172dfd5a5b1d2f5790236221dfc59f62232 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 err-cleanup() {
   echo 1 >~/.local/conflink
 }

diff --git a/distro-begin b/distro-begin
index c5d10cc015727b4e8ad09474864022f42af8bcff..4104e0015ce4ee1f44d1971696b1c1530be70087 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -59,7 +59,7 @@ interactive=true  # set this to false to force set -x
 if ! $interactive; then
   set -x
 fi
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 mkdir -p ~/.local
 err-cleanup() {

diff --git a/distro-end b/distro-end
index f2eef439a8dc74c97e3e3f99aaa4be6754e98f7a..5ba9421526a478e39c39bfa9dd7b25c18f765bc1 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -6,7 +6,7 @@
 export LC_USEBASHRC=t; if [[ -s ~/.bashrc ]]; then . ~/.bashrc; fi
 
 ### setup
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 src="$(readlink -f -- "${BASH_SOURCE[0]}")"; src=${src%/*} # directory of this file
 
 if [[ $EUID == 0 ]]; then

diff --git a/dynamic-ip-update b/dynamic-ip-update
index ccfe2becd2916349d93ca2db29f65718e61a6789..6c12ccb60fa0d4531883840b5037d8701d2c4779 100755 (executable)
--- a/dynamic-ip-update
+++ b/dynamic-ip-update
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
 this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"

diff --git a/filesystem/usr/local/bin/myupgrade b/filesystem/usr/local/bin/myupgrade
index 939bb6e535fb92c63ca80153f994217b3e95ae70..6c4ed879a7ee4baeb24c5e201e417534b967274b 100755 (executable)
--- a/filesystem/usr/local/bin/myupgrade
+++ b/filesystem/usr/local/bin/myupgrade
@@ -9,7 +9,7 @@
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 pre="${0##*/}:"
 PATH="/sbin:$PATH"
 m() { printf "$pre %s\n"  "$*"; "$@"; }

diff --git a/filesystem/usr/local/bin/myupgrade-iank b/filesystem/usr/local/bin/myupgrade-iank
index e93d63ebc21b663f24c4b730194f5929908b8690..b4cd1a48bcc36065ae8615b63f8cc10fadbb0461 100755 (executable)
--- a/filesystem/usr/local/bin/myupgrade-iank
+++ b/filesystem/usr/local/bin/myupgrade-iank
@@ -4,7 +4,7 @@
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 pre="${0##*/}:"
 m() { printf "$pre %s\n"  "$*"; "$@"; }
 e() { printf "$pre %s\n"  "$*"; }

diff --git a/fixvpndns b/fixvpndns
index 0619293aa181e2e6f259248a49966c79800ac436..a97b2bd1489633cba0bb7b3dbb3503bbac6a384f 100755 (executable)
--- a/fixvpndns
+++ b/fixvpndns
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright (C) 2019 Ian Kelling
 # SPDX-License-Identifier: AGPL-3.0-or-later
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 resolvuid=$(id -u systemd-resolve)
 case $EUID in

diff --git a/gen-amy-fstab b/gen-amy-fstab
index 2c2c91aa9963285104f7c0155936432ef64c5aba..4564697b3d3919eca3ba93bcec9f781f42adeb18 100755 (executable)
--- a/gen-amy-fstab
+++ b/gen-amy-fstab
@@ -6,10 +6,7 @@ if ! test "$BASH_VERSION"; then echo "error: shell is not bash" >&2; exit 1; fi
 shopt -s inherit_errexit 2>/dev/null ||: # ignore fail in bash < 4.4
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" exit status: $?, PIPESTATUS: ${PIPESTATUS[*]}" >&2' ERR
-# alternatively, using https://iankelling.org/git/?p=errhandle;a=tree
-# source /path/errhandle/err
-# on my machine
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 

diff --git a/gitslink b/gitslink
index e4b39dc56c6e856a74a999fdaaf703d10e0c57da..f44f2139a2b720ada824c4633011db10db4743f9 100755 (executable)
--- a/gitslink
+++ b/gitslink
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 e() { echo "$*"; "$@"; }
 lnf() { /a/bin/lnf/lnf "$@"; }

diff --git a/laptop-xrandr b/laptop-xrandr
index ce5ab3672002f3e438c50c18b284fa864f20a42a..a28600c1280e708fa75eefd01c442157a1cbd66e 100755 (executable)
--- a/laptop-xrandr
+++ b/laptop-xrandr
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 
 output=HDMI2

diff --git a/mail-route b/mail-route
index 0f10d2861c0d421bfd02b6596812559fcb9ec68a..582438b231b3b727f65b2705bad8c20c6a209a30 100755 (executable)
--- a/mail-route
+++ b/mail-route
@@ -17,7 +17,7 @@
 #set -x
 #exec &> >(logger)
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 usage() {
   cat <<'EOF'

diff --git a/mail-setup b/mail-setup
index e2d02f63b14ea5be6407d453d7ecf6975c2d168e..e2f7b21991ced794b4081ed1f05fac6b198f7020 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -183,10 +183,10 @@ if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
 
 shopt -s nullglob
 
-if [[ -s /usr/local/lib/err ]]; then
-  source /usr/local/lib/err
-elif [[ -s /a/bin/errhandle/err ]]; then
-  source /a/bin/errhandle/err
+if [[ -s /usr/local/lib/bash-bear ]]; then
+  source /usr/local/lib/bash-bear
+elif [[ -s /a/bin/bash-bear-trap/bash-bear ]]; then
+  source /a/bin/bash-bear-trap/bash-bear
 else
   echo "no err tracing script found"
   exit 1
@@ -2748,7 +2748,7 @@ EOF
     u /usr/local/bin/ncup <<'EOFOUTER'
 #!/bin/bash
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 m() { printf "%s\n" "$*";  "$@"; }
 err-cleanup() {

diff --git a/mailclean b/mailclean
index 31a431ab0b3fdd3c8f42cb404b8b214b2523f6b4..e79794a5a6fe236e38750258583f248ed188f976 100755 (executable)
--- a/mailclean
+++ b/mailclean
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 source /a/bin/bash_unpublished/source-state
 if [[ $HOSTNAME != "$MAIL_HOST" ]]; then

diff --git a/mailtest-check b/mailtest-check
index 54db2c2435c295e5a3eb43cb82900c2932dd6ba4..2287d708cdc44e0ccd572b0ff008ff38efe224a5 100755 (executable)
--- a/mailtest-check
+++ b/mailtest-check
@@ -8,7 +8,7 @@
 # wrong
 
 
-source /b/errhandle/err
+source /b/bash-bear-trap/bash-bear
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 

diff --git a/mount-latest-remote b/mount-latest-remote
index bcd9e284e1703c3c686860ae2cae3d3a5cd5760f..c80c00347a55033e01fdd977f5d778294b767c38 100755 (executable)
--- a/mount-latest-remote
+++ b/mount-latest-remote
@@ -16,7 +16,7 @@
 
 # usage: HOST [mount-latest-subvol args]
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
 
@@ -49,7 +49,7 @@ if [[ $tg == *:* ]]; then
   rsynctg="[$tg]"
 fi
 # R = relative, t = times, O = omit-dir-times, p = perms
-er rsync -RtOp bin/{mount-latest-subvol,check-subvol-stale} lib/err "root@$rsynctg:/usr/local" || continue
+er rsync -RtOp bin/{mount-latest-subvol,check-subvol-stale} lib/bash-bear "root@$rsynctg:/usr/local" || continue
 # note: this can hang if we have an old nfs mount.
 er ssh root@$tg timeout -s 9 600 /usr/local/bin/mount-latest-subvol "$@"
 

diff --git a/mount-latest-subvol b/mount-latest-subvol
index cad9e1cac53e1e60b144e3d257f658b89ce72443..13cfc3d159967ad8bff254093081dbe66933962a 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -18,7 +18,7 @@ readonly this_file
 cd /
 [[ $EUID == 0 ]] || exec sudo -E "$this_file" "$@"
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 usage() {
   cat <<EOF

diff --git a/myi3status b/myi3status
index d8c5d22e7c020280231c927ab784c1519b38860c..189e9f03ab7e6034106a26d3f53755a0a5fa2b6d 100755 (executable)
--- a/myi3status
+++ b/myi3status
@@ -52,7 +52,7 @@
 #
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 shopt -s nullglob
 shopt -s dotglob

diff --git a/nav2beet b/nav2beet
index 22322a60b4790275571605d92671beb43d62bd2f..fcd1fb23e8716b3f22482e1ba411594815fb5975 100755 (executable)
--- a/nav2beet
+++ b/nav2beet
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 source /a/bin/ds/beet-data
 source /b/bash_unpublished/source-semi-priv

diff --git a/nav2beet-local b/nav2beet-local
index a25c5c5c638bbf271b7b3566b7c8128055c76b84..4cee677d004ff09c67089e59b9c7a97b618b135c 100755 (executable)
--- a/nav2beet-local
+++ b/nav2beet-local
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 source /a/bin/ds/beet-data
 
 for r in 1 2 3 4 5; do

diff --git a/nextcloud-setup b/nextcloud-setup
index f2cddfc40103ba28f0aede1bfb869966c47b60dd..75e1625192c6260aaa11c43fcbc58cb0fd725ce6 100755 (executable)
--- a/nextcloud-setup
+++ b/nextcloud-setup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ -s /usr/local/lib/err ]]; then
-  source /usr/local/lib/err
+if [[ -s /usr/local/lib/bash-bear ]]; then
+  source /usr/local/lib/bash-bear
 else
   exit 1
 fi
@@ -217,7 +217,7 @@ systemctl enable --now $ncbase.timer
 i /usr/local/bin/ncup <<'EOFOUTER'
 #!/bin/bash
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 m() { printf "%s\n" "$*";  "$@"; }
 err-cleanup() {

diff --git a/primary-setup b/primary-setup
index 49961efed986a3fb6e704cf20de161603490d475..c9c34b7f414b5846821693307ab3c8ed60461e3f 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -3,7 +3,7 @@
 # usage $0 [MAIL_HOST]
 # setup things which involve being the primary host or not
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 script_name="${BASH_SOURCE[0]}"
 script_name="${script_name##*/}"

diff --git a/prof b/prof
index 35549f5b27b5dde21167105f682c246155d14f3a..e4d77d6491594fe4b3ba16ee4de29a99dc406624 100644 (file)
--- a/prof
+++ b/prof
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 dossh=true
 if (( $# >= 1 )); then

diff --git a/prof-backup b/prof-backup
index 7aefc21540e27f518e144d11584f173a65b8f1b0..cf9199bb031d716af23bc5d0bab85f94150e8698 100755 (executable)
--- a/prof-backup
+++ b/prof-backup
@@ -17,7 +17,7 @@
 # ssh root@kdwg.b8.nz systemctl --now enable profanity
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 source /a/bin/bash_unpublished/source-state
 if [[ $HOSTNAME != "$HOST2" ]]; then

diff --git a/prof-notify b/prof-notify
index 7c550b15dbef3d46958c282a857a62d9d5bd8bb6..442126972f356e152bbb32e6083c8a697ab5fe40 100644 (file)
--- a/prof-notify
+++ b/prof-notify
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 while read -r line; do
   # check that the profanity window is not focused

diff --git a/prof-remote b/prof-remote
index 787335d070b5a5b8d45013dc8b0e34ce36155ae6..9117f4630ae7881651cd47990b802f00811dfe95 100644 (file)
--- a/prof-remote
+++ b/prof-remote
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 remote=$1
 fastcon=0

diff --git a/prof-tail b/prof-tail
index 9830747337c8aa0852435e6ab024e08641e48ffd..abfa7186ea020421993f7980565aed26a476b21f 100644 (file)
--- a/prof-tail
+++ b/prof-tail
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 
 xmpp_users=(

diff --git a/script-files b/script-files
index 89a427735db21bada735b4cefd146f0cc48f96d2..6ed94b54a3352fecd19198e70c102d031aa87a62 100644 (file)
--- a/script-files
+++ b/script-files
@@ -40,6 +40,6 @@ my_service_scripts=(
 )
 
 # note: turn this into an array if we ever add more
-my_lib_files=/a/bin/errhandle/err
+my_lib_files=/a/bin/bash-bear-trap/bash-bear
 
 all_my_scripts=("${my_service_scripts[@]}" "${my_bin_files[@]}" $my_lib_files)

diff --git a/sl/.iank/bash-bear b/sl/.iank/bash-bear
new file mode 120000 (symlink)
index 0000000..84622fc
--- /dev/null
+++ b/sl/.iank/bash-bear
@@ -0,0 +1 @@
+/a/bin/bash-bear-trap/bash-bear
\ No newline at end of file

diff --git a/sl/.iank/err b/sl/.iank/err
deleted file mode 120000 (symlink)
index c877367..0000000
--- a/sl/.iank/err
+++ /dev/null
@@ -1 +0,0 @@
-/a/bin/errhandle/err
\ No newline at end of file

diff --git a/sound-alert b/sound-alert
index ea027f7deb3c49697ab62560f0c4ca97e2fbe6e1..4393043008cad5f1c8063c3f68f736365dc146f8 100755 (executable)
--- a/sound-alert
+++ b/sound-alert
@@ -1,4 +1,4 @@
 #!/bin/bash
-set -e; . /usr/local/lib/err; set +e
+set -e; . /usr/local/lib/bash-bear; set +e
 
 mpv --speed=1 --no-terminal --vo=null --volume=90 /a/bin/data/d20.wav

diff --git a/switch-mail-host b/switch-mail-host
index 3f299bab601488f44c7d4a7f64ce2601c04ed76c..b31ab793951f6807879e37eb1dcfd7beaf5ed39c 100644 (file)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 usage() {
   cat <<EOF
@@ -126,7 +126,7 @@ if ! $force && { $check_installed || [[ $direction == push ]]; } ; then
       uninstalled-file-die $f
     fi
   done
-  if ! diff -q /a/bin/errhandle/err /usr/local/lib/err; then
+  if ! diff -q /a/bin/bash-bear-trap/bash-bear /usr/local/lib/bash-bear; then
     uninstalled-file-die err
   fi
   if $check_installed; then

diff --git a/system-status b/system-status
index 7f3edf2411c08872f0a69febfb2b119ab61ff402..47d0a6753e7d6612989043dcbc82ccd664e69627 100755 (executable)
--- a/system-status
+++ b/system-status
@@ -13,7 +13,7 @@ if [[ $EUID != 1000 ]]; then
   exit 1
 fi
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 status_file=/dev/shm/iank-status
 
 shopt -s nullglob

diff --git a/trusted-network b/trusted-network
index f396803b72043467f97b64bf86688e6a96c79acf..c0ed8a5094fcdadd153b291e4461dbf7251b37d2 100755 (executable)
--- a/trusted-network
+++ b/trusted-network
@@ -6,7 +6,7 @@
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 readonly this_file=$(readlink -f -- "${BASH_SOURCE[0]}")
 readonly this_dir="${this_file%/*}"

diff --git a/zboot b/zboot
index 4e4edce21a7ad5a97a6da4e9fcb0d7469b36fd6b..e0fcc619b46ea556fd692385f073787a4038aa76 100755 (executable)
--- a/zboot
+++ b/zboot
@@ -3,7 +3,7 @@
 script=$(readlink -f -- "$BASH_SOURCE")
 [[ $EUID == 0 ]] || exec sudo -E "$script" "$@"
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 
 # Explaining this whole thing. The host amy is used by someone else,

diff --git a/ziva-backup-check b/ziva-backup-check
index 3db63fcd253a9bf743ebf4a3a1ec531c1bde7dc1..5c2ed56d9b749d1b91b256fb5c50f7f579500d30 100755 (executable)
--- a/ziva-backup-check
+++ b/ziva-backup-check
@@ -2,7 +2,7 @@
 # Copyright (C) 2019 Ian Kelling
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 

diff --git a/ziva-screen b/ziva-screen
index 7ce32c2c68e65e1a7bd0380e0585128766906bc7..5578835b136129341128d006e0951b9bbf26242f 100755 (executable)
--- a/ziva-screen
+++ b/ziva-screen
@@ -2,7 +2,7 @@
 
 # Get screenshots from bow, discard them if they dont change much.
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
 dest_dir=/d/ziva-log