fixes and improvements

[distro-setup] / brc2

diff --git a/brc2 b/brc2
index d51add8e40365e401367a9b7b13e615c1c5fe3a7..23cfd89aa14b5f1342229ca97acbf9abcf4b9eca 100644 (file)
--- a/brc2
+++ b/brc2
@@ -1283,7 +1283,7 @@ btrbk-date-sed() {
   done
 }
 jrbtrbk() {
-  jr -u btrbk-run -u btrbk -u switch-mail-host -u btrbk-spread "$@"
+  jr -u btrbk-run -u btrbk -u switch-mail-host "$@"
 }
 
 # internal function
@@ -1327,7 +1327,7 @@ btrbk-host-debug() {
 
     ## this takes a while, we only want to do it on 1st run
     # if [[ -s /tmp/b/$host.log ]]; then continue; fi
-    # ssh $host journalctl -u btrbk-run -u btrbk -u switch-mail-host -u btrbk-spread >/tmp/b/$host.log
+    # ssh $host journalctl -u btrbk-run -u btrbk -u switch-mail-host >/tmp/b/$host.log
   done
   gr '\bsnapshot success' /var/log/btrbk/*.log >/tmp/b/local.log
   cd /tmp/b
@@ -1385,8 +1385,6 @@ bbk() { # btrbk wrapper
       return 1
       ;;
   esac
-  # run latest
-  install-my-scripts
   # todo: consider changing this to srun and having the args come
   # from a file like /etc/default/btrbk, like is done in exim
   s jdo btrbk-run "$@"
@@ -1593,7 +1591,6 @@ sm() { # switch mail host
   if [[ ! $tmp ]]; then
     s ssh-add /root/.ssh/home
   fi
-  install-my-scripts
   s jdo switch-mail-host "$@"
   return $ret
 }
@@ -2295,11 +2292,6 @@ ccomp xdg-open o
 # jr() { journalctl "$@" | jfilter | less ; }
 # jrf() { journalctl -n 200 -f "$@" | jfilter; }
 
-jr() { journalctl "$@" ; }
-jrf() { journalctl -n 200 -f "$@" ; }
-
-
-ccomp journalctl jtail jr jrf
 
 ## old version for model01. i need to get that firmware working again.
 # kff() { # keyboardio firmware flash. you must hold down the tilde key
@@ -3815,9 +3807,9 @@ rgv() {
 }
 
 amall() {
-  printf "$(tput setaf 5 2>/dev/null ||:)█ coresite █$(tput sgr0 2>/dev/null||:)"
+  echo "$(tput setaf 5 2>/dev/null ||:)█ coresite █$(tput sgr0 2>/dev/null||:)"
   amfsf "$@"
-  printf "$(tput setaf 5 2>/dev/null ||:)█ office █$(tput sgr0 2>/dev/null||:)"
+  echo "$(tput setaf 5 2>/dev/null ||:)█ office █$(tput sgr0 2>/dev/null||:)"
   amoffice "$@"
 }
 amallq() { # amall quiet
@@ -3825,19 +3817,20 @@ amallq() { # amall quiet
   amoffice "$@"
 }
 amfsf() {
-  sedi -r '/alertmanager.url/s/@office//' ~/.config/amtool/config.yml
+  sedi -r '/alertmanager.url/s/@prom.office/@prom/' ~/.config/amtool/config.yml
   amtool "$@"
 }
 amoffice() {
-  sedi -r '/alertmanager.url/s/@fsf/@office.fsf/' ~/.config/amtool/config.yml
+  sedi -r '/alertmanager.url/s/@prom.fsf/@prom.office.fsf/' ~/.config/amtool/config.yml
   amtool "$@"
 }
 amls() {
   amall silence query "$@"
 }
 amrmall() {
-  amfsf silence expire $(amfsf silence query -q)
-  amoffice silence expire $(amoffice silence query -q)
+  # note: not sure if quoting of this arg is correct
+  amfsf silence expire "$(amfsf silence query -q)"
+  amoffice silence expire "$(amoffice silence query -q)"
 }