X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=eae5aa93439b60f921cc061cacee567cf47d2c1f;hb=6d1ec26482f86b0f2d9560ce3d04ea8c63297c25;hp=f3c4b24b84e6e493fd129c82e2860291f33ccbb4;hpb=4b3f043829a57215e1251122a8ab0019b717ca8d;p=distro-setup
diff --git a/brc2 b/brc2
index f3c4b24..eae5aa9 100644
--- a/brc2
+++ b/brc2
@@ -1,12 +1,36 @@
#!/bin/bash
-# Copyright (C) 2019 Ian Kelling
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# this gets sourced. shebang is just for file mode detection
# * settings
-HISTFILE=$HOME/.bh
+if [[ $LESSHISTFILE == - ]]; then
+ HISTFILE=
+ c() { cd "$@"; }
+elif [[ $HISTFILE ]]; then
+ HISTFILE=$HOME/.bh
+fi
source /a/bin/distro-setup/path-add-function
path-add /a/exe
@@ -20,6 +44,16 @@ 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-3.10.
+path-add --ifexists --end /p/bin
+
+case $HOSTNAME in
+ sy|bo)
+ # https://askubuntu.com/questions/1254544/vlc-crashes-when-opening-any-file-ubuntu-20-04
+ if grep -qE '^VERSION_CODENAME="(nabia|focal)"' /etc/os-release &>/dev/null; then
+ export MESA_LOADER_DRIVER_OVERRIDE=i965
+ fi
+ ;;
+esac
export WCDHOME=/a
@@ -27,6 +61,7 @@ export WCDHOME=/a
case $EUID in
0)
+ # shellcheck disable=SC2034 # used in brc
SL_SSH_ARGS="-F $HOME/.ssh/confighome"
;;
esac
@@ -42,14 +77,19 @@ source /a/bin/log-quiet/logq-function
source /a/bin/bash_unpublished/source-semi-priv
source /a/bin/bash_unpublished/source-state
-source /a/bin/log-quiet/logq-function
-if [[ -s /a/opt/alacritty/extra/completions/alacritty.bash ]]; then
- source /a/opt/alacritty/extra/completions/alacritty.bash
+if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
+ export MAIL_HOST_P=t
+else
+ export NOT_MAIL_HOST_P=t
fi
+source /a/bin/ds/beet-data
+
# * functions
+
+
multimic() {
local i
local -a sources
@@ -58,7 +98,7 @@ multimic() {
m pactl unload-module module-null-sink
m pactl unload-module module-remap-source
- sources=($(pacmd list-sources | sed -rn 's/.*name: <([^>]+).*/\1/p'))
+ IFS=" " read -r -a sources <<<"$(pacmd list-sources | sed -rn 's/.*name: <([^>]+).*/\1/p')"
if (( ! $# )); then
i=0
@@ -76,6 +116,8 @@ multimic() {
pactl load-module module-remap-source source_name=iancombine master=ianinput.monitor source_properties=device.description=iancombine
}
+# h ssh test
+# For testing restrictive ssh.
hstest() {
install-my-scripts
d=$(mktemp -d)
@@ -83,13 +125,32 @@ hstest() {
s command ssh -F $d/config -i /q/root/h "$@"
}
-hrtest() {
+# h rsync test
+# For testing restrictive rsync
+hrtest() { #
install-my-scripts
d=$(mktemp -d)
sed '/^ *IdentityFile/d' ~/.ssh/config >$d/config
s rsync -e "ssh -F $d/config -i /q/root/h" "$@"
}
+# rsync as root and avoid the default restrictive h key & config.
+rootrsync() {
+ s rsync -e "ssh -F /root/.ssh/confighome" "$@"
+}
+
+zcheck() {
+ ssh bow DISPLAY=:0 scrot /tmp/oegu.jpg
+ scp bow:/tmp/oegu.jpg /t
+ ssh bow rm /tmp/oegu.jpg
+ feh /t/oegu.jpg
+}
+zmon() {
+ while true; do
+ ziva-screen
+ sleep 15
+ done
+}
slemacs() {
local arg rtime v
@@ -137,10 +198,32 @@ rsync -rptL --delete --filter=". /b/ds/sl/rsync-filter" /a/opt/emacs-trisquel8-n
EOF
}
+rm-docker-iptables() {
+ s iptables -S | gr docker | gr -- -A | sed 's/-A/-D/'| while read -r l; do sudo iptables $l; done
+ s iptables -S -t nat | gr docker | gr -- -A | sed 's/-A/-D/'| while read -r l; do sudo iptables -t nat $l; done
+ s iptables -S | gr docker | gr -- -N | sed 's/-N/-X/'| while read -r l; do sudo iptables $l; done
+ s iptables -S -t nat | gr docker | gr -- -N | sed 's/-N/-X/'| while read -r l; do sudo iptables -t nat $l; done
+}
+
# usage mkschroot [-] distro codename packages
# - means no piping in of sources.list
+#
+# note some useful post mkschroot i've used in the past
+# tu /nocow/schroot/flidas/etc/sudoers </etc/exim4/no-delay-eximids
+}
+edelayon() {
+ echo >/etc/exim4/no-delay-eximids
+}
+
eqgo() {
- enn -M $(exiqgrep -i)
+ local -a array tmpstr delayon
+ delayon=true
+ if grep -qFx all /etc/exim4/no-delay-eximids; then
+ delayon=false
+ fi
+ if $delayon; then
+ echo all >/etc/exim4/no-delay-eximids
+ fi
+ tmpstr=$(exiqgrep -i -r.\*)
+ mapfile -t array <<<"$tmpstr"
+ enn -M "${array[@]}"
+ if $delayon; then
+ echo >/etc/exim4/no-delay-eximids
+ fi
}
eqgo1() {
- enn -M $(exiqgrep -i|h1)
+ local eid
+ eid="$(exipick -i -r.\*|h1)"
+ sed -n "/^all$/p;\$a $eid" /etc/exim4/no-delay-eximids
+ enn -M "$eid"
+}
+ennm() {
+ local eid
+ for eid; do
+ printf "%s\n" "$eid" >>/etc/exim4/no-delay-eximids
+ done
+ enn -M "$@"
}
@@ -266,19 +379,6 @@ abrowserrmcompat() {
fi
ngreset
}
-ngset() {
- if shopt nullglob >/dev/null; then
- ngreset=false
- else
- shopt -s nullglob
- ngreset=true
- fi
-}
-ngreset() {
- if $ngreset; then
- shopt -u nullglob
- fi
-}
checkre() {
s checkrestart -b /a/bin/ds/checkrestart-blacklist -pv
@@ -292,11 +392,17 @@ cp-blocked-domains-to-ansible() {
}
-anki() {
- # crashes on adding new cards in t9
- schroot -c buster -- anki
+daycat() {
+ ngset
+ hrcat /m/md/daylert/{cur,new}/*
+ ngreset
+}
+dayclear() {
+ ngset
+ rm -f /m/md/daylert/{cur,new}/*
}
+
acat() {
ngset
hrcat /m/md/alerts/{cur,new}/*
@@ -318,7 +424,7 @@ alerts() {
ralerts() { # remote alerts
local ret shell
# this list is duplicated in check-remote-mailqs
- for h in bk je li frodo kwwg x3wg x2wg kdwg sywg; do
+ for h in bk je li frodo x3wg kdwg sywg; do
echo $h:
shell="ssh $h"
if [[ $HOSTNAME == "${h%wg}" ]]; then
@@ -340,7 +446,7 @@ ap() {
}
aw() {
pushd /a/work/ans >/dev/null
- time ansible-playbook -v -i inventory adhoc.yml "$@"
+ time ansible-playbook -i inventory adhoc.yml "$@"
popd >/dev/null
}
ad() {
@@ -353,7 +459,1037 @@ astudio() {
# googling android emulator libGL error: failed to load driver: r600
# lead to http://stackoverflow.com/a/36625175/14456
export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
- /a/opt/android-studio/bin/studio.sh "$@" &r;
+ /a/opt/android-studio/bin/studio.sh "$@" & r
+}
+
+# Convert brains file path to url and vice versa
+# usage: brains [URL_OR_PATH]
+brains() {
+ _iki-convert brains.fsf.org/wiki "$@"
+}
+glue() {
+ _iki-convert gluestick.office.fsf.org "$@"
+}
+
+# usage: see above
+_iki-convert() {
+ local url url_prefix path input repo_dir dir url_dir url name
+ url_prefix="$1"
+ name="${url_prefix%%.*}"
+ repo_dir="/f/$name"
+ shift
+ if [[ $1 ]]; then
+ input="$*"
+ else
+ read -r -p "enter path or url"$'\n' input
+ fi
+ case $input in
+ http*)
+ path="$repo_dir/${input##http*://"$url_prefix"/}"
+ # for files like x.jpg, we dont need to convert the extension.
+ if [[ $path == */ ]]; then
+ path=${path%/}.mdwn
+ # brains adds trailing slash, but without trailing is still
+ # valid. We can't be totally sure whether to add mdwn, but we
+ # can guess based on the existence of the file. We can't be sure
+ # because it could be a file like x.jpg, that we just don't have
+ # in our local repo.
+ elif [[ ! -f $path && -e $path.mdwn ]]; then
+ path=${path}.mdwn
+ fi
+ j printf "%s\n" "$path"
+ ;;
+ *)
+ path=$(fp "$input")
+ url_dir=$(echo "$path" | sed -r "s,^(/a)?$repo_dir/,,")
+ url="https://$url_prefix/$url_dir"
+ if [[ $url == *.mdwn ]]; then
+ url="${url%.mdwn}/"
+ fi
+ j echo "$url"
+ ;;
+ esac
+}
+
+
+# Generate beet smartplaylists for navidrome.
+# for going in the reverse direction, run
+# /b/ds/navidrome-playlist-export
+beetsmartplaylists() {
+ install -m 0700 -d /tmp/ianbeetstmp
+ beet splupdate
+ # kill off any playlists we deleted. they will still need manual
+ # killing from a navidrome client.
+ rm -rf /i/converted/beetsmartplaylists
+ mkdir -p /i/converted/beetsmartplaylists
+ for f in /tmp/ianbeetstmp/*; do
+ sed 's,^/i/m,/i/converted,;s,\.flac$,.mp3,' "$f" >"/i/converted/beetsmartplaylists/${f##*/}"
+ rm "$f"
+ done
+ rmdir /tmp/ianbeetstmp
+}
+
+# internal function for beetrating, in case we need to ssh
+beetrating-stdin() {
+ local tmp rating path cpath sqlpath userid
+ # plucked this from the db. im the only user.
+ userid=23cc2eb9-e35e-4811-a0f0-d5f0dd6eb634
+ while read -r rating path; do
+ cpath="/i/converted${path#/i/m}" # converted path
+ case $cpath in
+ *.flac)
+ cpath="${cpath%.*}.mp3"
+ ;;
+ esac
+ if [[ ! -e $cpath ]]; then
+ echo "beetraing: error: this should not happen, path does not exist: $cpath"
+ return 1
+ fi
+ sqlpath="${cpath//\'/\'\'}"
+ old_rating=$(sqlite3 /i/navidrome/navidrome.db "select rating from annotation inner join media_file on item_id = id where path = '$sqlpath' and item_type = 'media_file';")
+ if [[ $old_rating ]]; then
+ if [[ $old_rating != "$rating" ]]; then
+ echo "setting rating $old_rating -> $rating $cpath"
+ # https://stackoverflow.com/a/50317320
+ # we got a timeout error once. arbitrarily chose 15 seconds.
+ sqlite3 /i/navidrome/navidrome.db ".timeout 15000" "
+update annotation set rating = $rating
+ where item_id in (
+ select media_file.id from annotation inner join media_file on annotation.item_id = media_file.id
+ where media_file.path = '$sqlpath' and annotation.item_type = 'media_file' );"
+ fi
+ else
+ echo "setting rating $rating $cpath"
+ # /a/opt/navidrome/persistence/sql_annotations.go v0.48.0
+ # https://www.sqlite.org/lang_insert.html
+ sqlite3 /i/navidrome/navidrome.db ".timeout 15000" "insert into annotation select '$(uuidgen)', '$userid', id, 'media_file', 0, NULL, $rating, 0, NULL from media_file where path = '$sqlpath';"
+ fi
+ done
+}
+
+# Export beets ratings into navidrome
+beetrating() {
+ local ssh_prefix
+ if [[ $HOSTNAME != kd ]]; then
+ ssh_prefix="ssh b8.nz"
+ fi
+ # shellcheck disable=SC2016 # obvious reason
+ beet ls -f '$rating $path' $nav_convert_query | $ssh_prefix beetrating-stdin
+}
+
+# Do transcoding and hardlinking of audio files for navidrome.
+beetconvert() {
+ local tmpf
+ tmpf="$(mktemp)"
+ # a bunch of effort to ignore output we dont care about...
+ sed 's/^format_item:.*/format_item: ignore_this/' ~/.config/beets/config.yaml >$tmpf
+ beet -c $tmpf convert -y $nav_convert_query > >(grep -vFx 'ignore_this' ||:) 2> >(grep -v '^convert: Skipping' ||:)
+ rm "$tmpf"
+}
+# This deletes files in the converted directory which should no longer
+# be there due to a rename of the unconverted file.
+beetconvert-rm-extras() {
+ local l tmpf
+ local -A paths
+ tmpf="$(mktemp)"
+ # shellcheck disable=SC2016 # obvious reason
+ beet ls -f '$path' $nav_convert_query >"$tmpf"
+ ## begin removal of files that are leftover from previous conversion,
+ # eg, previously rated > 1, now rated 1.
+ while read -r l; do
+ convertedpath="/i/converted${l#/i/m}"
+ case $convertedpath in
+ *.flac) convertedpath="${convertedpath%.flac}.mp3" ;;
+ esac
+ paths[$convertedpath]=t
+ done <"$tmpf"
+
+ find /i/converted -path /i/converted/beetsmartplaylists -prune -o \( -type f -print \) -name '*.mp3' -o -name '*.m4a' >"$tmpf"
+ while read -r l; do
+ if [[ ! ${paths[$l]} ]]; then
+ rm -v "$l"
+ fi
+ # note: the pruning is duplicative of filtering on name, but whatever.
+ done <"$tmpf"
+ rm "$tmpf"
+}
+
+beets-gen-playlists() {
+ local i str
+ local -a query_array query_str
+ for i in "${!bpla[@]}"; do
+ query_str=()
+ eval "query_array=(${bpla[$i]})"
+ for str in "${query_array[@]}"; do
+ query_str+=("\"$str\"")
+ done
+ cat <$tmpf
+ beet -c $tmpf modify -y "$@" > >(grep -vFx -e 'ignore_this' -e 'Modifying 1 items.' ||:)
+ rm "$tmpf"
+ beetag-nostatus 1
+}
+
+kill-bg-quiet() {
+ # https://stackoverflow.com/a/5722874
+ kill %% 2>/dev/null ||:; wait %% 2>/dev/null ||:
+}
+
+# debug variables
+dv() {
+ for arg; do
+ printf "%s=%s " "$arg" "${!arg}"
+ done
+ echo
+}
+
+# Must be called from beetag for variables to be setup
+beetag-help() {
+ local -i i j col_total row col button_total row_total remainder_cols remainder_term
+ col_total=4
+ button_total=${#button_map[@]}
+ row_total=$(( button_total / col_total ))
+ remainder_cols=$(( button_total % col_total ))
+ # for debugging
+ #dv button_total row_total remainder_cols
+ beetag-nostatus
+ # - 3 is just a constant that helps things work in practice.
+ if [[ $LINES ]] && (( LINES - 3 < scrolled )); then
+ hr
+ for (( i=0; i/dev/null; then
+ printf "%s\n" "$*" | socat - /tmp/mpvsock >/dev/null ||:
+ fi
+}
+# meant to be called from beetag
+# o for get output
+mpvrpco() {
+ # note: testing for background jobs will output nothing if we are in a pipeline
+ printf "%s\n" "$*" | socat - /tmp/mpvsock ||:
+}
+
+# meant to be called from beetag
+mpvrpc-percent-pos() {
+ mpvrpco '{ "command": ["get_property", "percent-pos"] }' | jq .data | sed 's/\..*/%/' 2>/dev/null ||:
+}
+
+# run if not running.
+#
+# Note: this does not work with shell scripts as they are normally
+# invoked, because the ps output has the interpreter at the start.
+# A workaround is to invoke the command in that format, or we could
+# do various other workarounds.
+#
+# background, this relies on how ps converts newlines in arguments to spaces, and
+# assumes we won't be searching for a command with spaces in its arguments
+rinr() {
+ # shellcheck disable=SC2009 # pgrep has no fixed string option, plus see above.
+ if ps h -o args -C "${1##*/}" | grep -Fxqv "$*" &>/dev/null || [[ $? == 141 ]]; then
+ "$@"
+ fi
+}
+# variation of above: run or wait if running
+rowir() {
+ local pid
+ pid=$(ps h -o 'pid,args' -C "${1##*/}" | sed -r 's/^[[:space:]]*([0-9]+)[[:space:]](.*)/\1\n\2/' | grep -B1 -Fx "$*" | head -n1 ||: )
+ if [[ $pid ]]; then
+ # https://unix.stackexchange.com/questions/427115/listen-for-exit-of-process-given-pid
+ tail --pid="$pid" -f /dev/null
+ else
+ "$@"
+ fi
+}
+
+mpvrpc-loadfile() {
+ local path nextpath cachedir finalpath nextpath count
+ cachedir=$HOME/.iank-music-cache
+ path="$1"
+ nextpath="$2"
+
+ # note: logic duplicated in beetpull
+ local remote_p=true
+ if [[ $HOSTNAME == kd ]]; then
+ remote_p=false
+ fi
+
+ if $remote_p; then
+ finalpath="$cachedir${path#/i/m}"
+ rowir rsync --partial -a --inplace --mkpath "b8.nz:$path" "$finalpath"
+ finalnextpath="$cachedir${nextpath#/i/m}"
+ count=$(pgrep -a -f "^rsync --partial -a --inplace --mkpath $cachedir" || [[ $? == 1 ]] )
+ # allow us to start 2 rsyncs in the background
+ if [[ $count == [01] ]]; then
+ rinr rsync --partial -a --inplace --mkpath "b8.nz:$nextpath" "$finalnextpath" &
+ fi
+ else
+ finalpath="$path"
+ fi
+ mpvrpc '{ "command": ["loadfile", "'"$finalpath"'"] }'
+}
+
+# tag with beets.
+# usage: beetag [-r] [-s] QUERY
+# it lists the query, reads an input char for tagging one by one.
+#
+# note, you may want to change the play command for doing rapid taging
+# by immediately jumping forward into the song. this is set in the beets
+# config yaml.
+#
+# (available buttons: ` \ ) ] [ and non-printing chars, see
+# https://stackoverflow.com/questions/10679188/casing-arrow-keys-in-bash
+#
+#
+# note: after foregrounding the player, must quit it to get back. can't ctrl-c.
+#
+# keys I dont need help to remember:
+# 1-5 rate
+# q quit
+# ret next
+#
+# todo: enter should also unpause
+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 line lsout tmp ls_line skip_lookback
+ local escape_char escaped_input expected_input skip_input_regex right_pad erasable_line seek_sec
+ local pl_state_path pl_state_dir pl_state_file tmpstr
+ local new_random pl_seed_path seed_num seed_file fmt first_play repeat1
+ local -a buttons button_map ids tags tmp_tags initial_ls ls_lines paths
+ local -A button_i
+ local -i i j volume scrolled id_count line_int skip_start pre_j_count head_count skip_lookback
+ local -i overflow_lines overflow
+
+ first_play=true
+ erasable_line=false
+ escape_char=$(printf "\u1b")
+ scrolled=999 # more than any $LINES
+ ### begin arg processing ###
+ random=false
+ repeat1=false
+ new_random=false
+ case $1 in
+ -r)
+ random=true
+ shift
+ ;;
+ -s)
+ random=false
+ shift
+ ;;
+ -x)
+ new_random=true
+ shift
+ ;;
+ esac
+ if (( ! $# )); then
+ echo beetag: error expected a query arg >&2
+ return 1
+ fi
+ ### end arg processing ###
+
+ # note: I used to do beetpull here, but mpv + ssfs on slowish
+ # connection leads to bad/buggy result.
+
+ do_rare_genres=false
+ volume=70
+ read_wait=2
+ doplay=true
+
+ last_genre_i=$(( ${#common_genres[@]} - 1 ))
+ buttons=( {a..p} {r..w} {6..8} , . / - "=")
+ button_map=(${common_genres[@]} ${pl_tags[@]})
+ fstring=
+ for tag in "${pl_tags[@]}"; do
+ fstring+="%ifdef{$tag,$tag }"
+ done
+
+ for (( i=0; i<${#buttons[@]}; i++ )); do
+ button_i[${buttons[i]}]=$i
+ done
+
+ # note: this structure of files is rather haphazard.
+ seed_num=1 # later we might want a few
+ seed_file=seed$seed_num
+ if $random; then
+ pl_state_file=$seed_num
+ else
+ pl_state_file=sorted
+ fi
+ pl_state_dir=/i/info/pl-state
+ if [[ $playlist ]]; then
+ pl_state_dir=$pl_state_dir/$playlist
+ else
+ pl_state_dir=$pl_state_dir/nopl
+ fi
+ pl_state_path=$pl_state_dir/$pl_state_file
+ pl_seed_path=$pl_state_dir/$seed_file
+
+
+ if $new_random || [[ ! -r $pl_seed_path ]]; then
+ mkdir -p $pl_state_dir
+ { base64 < /dev/urandom | head -c 200 ||:; echo; } > $pl_seed_path
+ fi
+
+ # PijokVipiotOzeph is just a random string for a delimiter
+ # shellcheck disable=SC2016 # false positive
+ fmt='%ifdef{rating,$rating }'"$fstring"'$genre | $title - $artist - $album $length $id PijokVipiotOzeph $path'
+ # shellcheck disable=SC2016 # obvious reason
+ tmpstr=$(beet ls -f "$fmt" "$@" | { if $random; then sort -R --random-source=$pl_seed_path; else cat; fi; } )
+ mapfile -t initial_ls <<<"$tmpstr"
+ if [[ ! ${initial_ls[0]} ]]; then
+ echo "beetag: error: no result from beet ls $*"
+ return 1
+ fi
+ id_count=${#initial_ls[@]}
+ for line in "${initial_ls[@]}"; do
+ path="${line#*PijokVipiotOzeph }"
+ # https://github.com/koalaman/shellcheck/issues/2171
+ # shellcheck disable=SC2190 # bug in shellcheck, looking at paths from an earlier function
+ paths+=("$path")
+ line_no_path="${line% PijokVipiotOzeph*}"
+ id="${line_no_path##* }"
+ ids+=("$id")
+ right_pad="${line_no_path%% |*}"
+ ls_line="$(printf %-11s "$right_pad")${line_no_path#"$right_pad"}"
+ ls_lines+=("$ls_line")
+ i=$(( i+1 ))
+ done
+
+
+
+
+ j=0
+ if [[ $playlist ]]; then
+ if [[ -r $pl_state_path ]]; then
+ j=$(cat $pl_state_path)
+ fi
+ fi
+
+ # i only care to see a smallish portion of the list when starting.
+ head_count=$(( LINES - 20 ))
+ head_start=$(( j - head_count / 2 ))
+ if (( head_start < 0 )); then
+ head_start=0
+ fi
+ for (( i=head_start; i < head_count && i < id_count; i++ )); do
+ ls_line="${ls_lines[$i]}"
+ if (( i == j )); then
+ echo "* $ls_line"
+ else
+ echo "$ls_line"
+ fi
+ done
+ if $doplay; then
+ #{ mpv --profile=a --volume=$volume --idle 2>&1 & } 2>/dev/null
+ mpv --profile=a --volume=$volume --idle &
+ # if we dont sleep, can expect an error like this:
+ # socat[1103381] E connect(5, AF=1 "/tmp/mpvsock", 14): Connection refused
+ sleep .1
+ fi
+
+ while true; do
+ id=${ids[j]}
+ path="${paths[$j]}"
+ lsout="${ls_lines[j]}"
+ tags=( ${lsout%%,*} )
+ beetag-help
+ printf "ââ %s\n" "$lsout"
+ beetag-nostatus 1
+ if $doplay; then
+ # https://stackoverflow.com/a/7687716
+ # note: duplicated down below
+ #
+ # notes on old method of invoking mpv each time:
+ # https://superuser.com/questions/305933/preventing-bash-from-displaying-done-when-a-background-command-finishes-execut
+ # we can't disown or run in a subshell or set +m because all that
+ # disabled job control from working properly in ways we want.
+ # todo: figure out some kind of answer to this. I think the solution
+ # is that we are waiting in 2 second intervals and checking if the
+ # background job exists. Instead, we should make mpv just idle
+ # when it is done with a song and then send it a command to play a new track.
+ #{ mpv --profile=a --volume=$volume "$path" 2>&1 & } 2>/dev/null
+ # old
+ #{ beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null
+
+ # on slow systems, we may need to wait like .3 seconds before mpv
+ # is ready. so impatiently check until it is ready
+ if $first_play; then
+ first_play=false
+ for (( i=0; i<20; i++ )); do
+ if [[ $(mpvrpco '{ "command": ["get_property", "idle-active"] }' 2>/dev/null | jq .data) == true ]]; then
+ mpvrpc-loadfile "$path" 2>/dev/null
+ break
+ fi
+ sleep .1
+ done
+ else
+ mpvrpc-loadfile "$path"
+ fi
+ erasable_line=false
+ fi
+ while true; do
+ char=
+ if $doplay; then
+ ret=0
+ read -rsN1 -t $read_wait char || ret=$?
+ read_wait=2
+ # Automatically skip to the next song if this one ends, unless
+ # we turn off the autoplay.
+ if (( ret == 142 )) || [[ ! $char ]]; then
+ if jobs -p | grep -q . &>/dev/null && \
+ [[ $(mpvrpco '{ "command": ["get_property", "idle-active"] }' | jq .data) == false ]]; then
+ continue
+ else
+ break
+ fi
+ fi
+ else
+ read -rsN1 char
+ fi
+ beetag-help
+ if [[ $char == $'\n' ]]; then
+ break
+ fi
+ case $char in
+ ";")
+ j=$(( j - 2 ))
+ break
+ ;;
+ "'")
+ if $doplay; then
+ echo "play toggled off"
+ doplay=false
+ else
+ doplay=true
+ mpvrpc-loadfile "$path"
+ erasable_line=false
+ fi
+ beetag-nostatus 1
+ continue
+ ;;
+ _)
+ m beet rm --delete --force "id:$id"
+ beetag-nostatus 4 # guessing. dont want to test atm
+ break
+ ;;
+ [1-5])
+ beetmq "id:$id" rating=$char
+ continue
+ ;;
+ 9)
+ volume=$(( volume - 5 ))
+ if (( volume < 0 )); then
+ volume=0
+ fi
+ ;;&
+ 0)
+ volume+=5
+ if (( volume > 130 )); then
+ volume=130
+ fi
+ ;;&
+ 0|9)
+ mpvrpc '{ "command": ["set_property", "volume", '$volume'] }'
+ beetag-status
+ echo volume=$volume
+ continue
+ ;;
+ ']')
+ if $repeat1; then
+ repeat1=false
+ else
+ repeat1=true
+ fi
+ echo repeat1=$repeat1
+ continue
+ ;;
+ q)
+ kill-bg-quiet
+ return
+ ;;
+ y)
+ if $do_rare_genres; then
+ do_rare_genres=false
+ button_map=(${common_genres[@]} ${pl_tags[@]})
+ last_genre_i=$(( ${#rare_genres[@]} - 1 ))
+ else
+ do_rare_genres=true
+ button_map=(${rare_genres[@]} ${pl_tags[@]})
+ last_genre_i=$(( ${#rare_genres[@]} - 1 ))
+ fi
+ local -A button_i
+ for (( i=0; i<${#buttons[@]}; i++ )); do
+ button_i[${buttons[i]}]=$i
+ done
+ for (( i=0; i<${#button_map[@]}; i++ )); do
+ echo ${buttons[i]} ${button_map[i]}
+ done
+ continue
+ ;;
+ z)
+ beetag-nostatus 3
+ # if we ctrl-z, it will put the whole function into sleep. so
+ # basically, we can't return from a foregrounded mpv like we
+ # would like to without some strange mechanism I can't think
+ # of. So, instead, detect ctrl-c and wait a while for prompt
+ # input. One idea would be to use a music player like mpd where
+ # we can send it messages.
+ if ! fg; then
+ read_wait=10
+ fi
+ continue
+ ;;
+
+ #
+ " ")
+ # output time if we aren't already paused
+ if [[ $(mpvrpco '{ "command": ["get_property", "pause"] }' | jq .data) == false ]]; then
+ # minutes/seconds
+ #date -d @"$(mpvrpco '{ "command": ["get_property", "playback-time"] }' | jq .data)" +%M:%S ||:
+ beetag-status
+ mpvrpc-percent-pos
+ fi
+ # originally found this solution, which worked fine.
+ #kill -STOP %% &>/dev/null
+ #
+ mpvrpc '{ "command": ["cycle", "pause"] }'
+ continue
+ ;;
+ "$escape_char")
+ expected_input=true
+ read -rsn2 escaped_input
+ skip_input_regex="^[0-9]+$"
+ case $escaped_input in
+ # up char: show all the songs, use less
+ '[A')
+ skip_start=0
+ skip_lookback=5
+ if (( j - skip_lookback > skip_start )); then
+ skip_start=$(( j - skip_lookback ))
+ fi
+ beetag-nostatus $(( id_count - skip_start - 1 ))
+ {
+ line_int=0
+ for (( i=skip_start; i < id_count; i++ )); do
+ if (( i == j )); then
+ echo " * ${ls_lines[i]}"
+ continue
+ fi
+ echo "$line_int | ${ls_lines[i]}"
+ line_int+=1
+ done
+ } | less -F
+ ;;
+ # down char
+ '[B')
+ # skip forward, but show the last few songs anyways.
+ skip_start=0
+ skip_lookback=3
+ if (( j - skip_lookback > skip_start )); then
+ skip_start=$(( j - skip_lookback ))
+ fi
+ beetag-nostatus $(( id_count - skip_start - 1 ))
+
+ line_int=0
+ overflow_lines=$LINES
+ for (( i=skip_start; i < overflow_lines - 1 && i < id_count; i++ )); do
+ ls_line="${ls_lines[i]}"
+ overflow=$(( ${#ls_line} / ( COLUMNS - 1 ) ))
+ overflow_lines=$(( overflow_lines - overflow ))
+ if (( i == j )); then
+ echo " * $ls_line"
+ continue
+ fi
+ echo "$line_int | $ls_line"
+ line_int+=1
+ done
+ ;;
+ # left key
+ '[D')
+ seek_sec=-8
+ ;;&
+ # right key
+ '[C')
+ seek_sec=8
+ ;;&
+ '[C'|'[D')
+ beetag-status
+ mpvrpc-percent-pos
+ erasable_line=true
+ mpvrpc '{ "command": ["seek", "'$seek_sec'"] }'
+ continue
+ ;;
+ *)
+ expected_input=false
+ ;;
+ esac
+ if $expected_input; then
+ read -r skip_input
+ case $skip_input in
+ q)
+ kill-bg-quiet
+ return
+ ;;
+ esac
+ if [[ $skip_input =~ $skip_input_regex ]]; then
+ pre_j_count=$(( j - skip_start ))
+ j=$(( j + skip_input - pre_j_count ))
+ if (( skip_input < pre_j_count )); then
+ j=$(( j - 1 ))
+ fi
+ fi
+ break
+ fi
+ ;;
+ esac
+ char_i=${button_i[$char]}
+ new_item=${button_map[$char_i]}
+ if [[ ! $char_i || ! $new_item ]]; then
+ echo "error: no mapping of input: $char found, try again"
+ continue
+ fi
+ if (( char_i <= last_genre_i )); then
+ m beetmq "id:$id" genre=$new_item
+ else
+ remove=false
+ tmp_tags=()
+ for tag in ${tags[@]}; do
+ if [[ $new_item == "$tag" ]]; then
+ remove=true
+ else
+ tmp_tags+=("$tag")
+ fi
+ done
+ if $remove; then
+ tags=("${tags[@]}")
+ m beetmq "id:$id" "$new_item!"
+ else
+ tags+=("$new_item")
+ m beetmq "id:$id" $new_item=t
+ fi
+ fi
+ done
+ if ! $repeat1; then
+ if (( j < id_count - 1 )); then
+ j+=1
+ else
+ j=0
+ fi
+ fi
+ if [[ $playlist ]]; then
+ echo $j >$pl_state_path
+ fi
+ done
+}
+
+# usage: FILE|ALBUM_DIR [GENRE]
+beetadd() {
+ local import_path genre_arg single_track_arg
+ import_path="$1"
+ if [[ ! -e $import_path ]]; then
+ echo "beetadd error: path does not exist"
+ fi
+ if [[ $2 ]]; then
+ genre_arg="--set genre=$2"
+ fi
+ if [[ -f $import_path ]]; then
+ single_track_arg=-s
+ fi
+ beet import --set totag=t $single_track_arg $genre_arg "$import_path"
+ beetag totag:t
+ beet modify -y totag:t "totag!"
+}
+
+# update navidrome music data after doing beets tagging
+beet2nav() {
+ m beetpull
+ m beetconvert
+ m beetrating
+ # this function would naturally just be part of beetconvert,
+ # but we want beetrating to happen sooner so that our ssh auth dialog
+ # happens earlier. Currently 17 seconds for that.
+ m beetconvert-rm-extras
+ m beetsmartplaylists
+}
+
+# pull in beets library locally
+beetpull() {
+ local sshfs_host sshfs_cmd
+ sshfs_host=b8.nz
+ if [[ $HOSTNAME == kd ]]; then
+ return 0
+ fi
+ if [[ ! -e /i ]]; then
+ s mkdir /i
+ s chown iank:iank /i
+ fi
+ sshfs_cmd="sshfs -o ServerAliveInterval=15,reconnect $sshfs_host:/i /i"
+ if ! pgrep -f "^$sshfs_cmd$" >/dev/null; then
+ m $sshfs_cmd
+ fi
+}
+
+# remove all playlists in navidrome, for when I make big
+# playlist name changes and just want to scrap everything.
+nav-rm-plists() {
+ local tmpf id
+ tmpf=$(mktemp)
+ if [[ $HOSTNAME != kd ]]; then
+ echo "error: run on kd"
+ return 1
+ fi
+ sqlite3 /i/navidrome/navidrome.db "select id from playlist" >$tmpf
+ while read -r id; do
+
+ curl --http1.1 --user "iank:$navidrome_pw" "https://b8.nz/rest/deletePlaylist.view?u=iank&s=sb219dvv7egnoe4i47k75cli0m&t=1c8f5575cd0fdf03deb971187c9c88b1&v=1.2.0&c=DSub&id=$id"
+ done <$tmpf
+ rm $tmpf
+}
+
+# escape regex.
+#
+# This is not perfect but generally good enough. It escapes all
+# metachars listed man 3 pcrepattern.
+er() {
+ sed 's/[]\\^$.[|()?*+{}]/[&]/g; s/\^/\\^/g' <<<"$*"
+}
+
+# usage beegenre QUERY
+#
+# beet set genre for QUERY based on existing artist most used genre on
+#
+# inverse of query for each artist found in QUERY. If query starts with
+# "artist:" it is used as the artist instead of each artist in QUERY.
+#
+beegenre() {
+ local count artist artregex genre singleartist tmpf tmpf2
+ local -a artists genres
+ singleartist=false
+ case $1 in
+ artist:*)
+ singleartist=true
+ artist="$1"
+ shift
+ ;;
+ esac
+ tmpf=$(mktemp)
+ tmpf2=$(mktemp)
+ if $singleartist; then
+ # shellcheck disable=SC2016 # obvious reason
+ beet ls -f '$genre' "$artist" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1 >$tmpf
+ read -r count genre <$tmpf ||:
+ beet modify "$artist" "$@" genre=$genre
+ else
+ # shellcheck disable=SC2016 # obvious reason
+ beet ls -f '$artist' "$@" | sort -u >$tmpf
+ while read -r artist; do
+ artregex=$(er "$artist")
+ # shellcheck disable=SC2016 # obvious reason
+ beet ls -f '$genre' "artist::^$artregex$" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1 >$tmpf2
+ read -r count genre <$tmpf2 || continue
+ if [[ $count ]]; then
+ artists+=("$artregex")
+ genres+=("$genre")
+ echo "beet modify -y $* \"artist::^$artist$\" genre=$genre # $count"
+ fi
+ done <$tmpf
+ read -r -N 1 -s -p "Y/n " char
+ case $char in
+ [Yy$'\n'])
+ for (( i=0; i<${#artists[@]}; i++ )); do
+ beet modify -y "$@" "artist::^${artists[i]}$" genre=${genre[i]}
+ done
+ ;;
+ esac
+ fi
+ rm $tmpf
+}
+
+# prettify the date
+btrbk-date() {
+ local indate
+ indate="$1"
+ shift
+ date +%F_%T%:::z -d "$(sed -r 's/(.{4})(..)(.{5})(..)(.*)/\1-\2-\3:\4:\5/' <<<"$indate")" "$@"
+}
+btrbk-undate() {
+ # fudCaHougfirp is a random string
+ { if [[ $1 ]]; then
+ echo "$1"
+ else
+ cat
+ fi
+ } | sed -r 's/-0([45])( |$)/fudCaHougfirp0\100/;s/_/T/;s/[:-]//g;s/fudCaHougfirp/-/'
+
+}
+btrbk-date-sed() {
+ local line
+ while read -r line; do
+ if [[ $line == *20[0-9][0-9][0-9][0-9][0-9][0-9]T[0-9][0-9][0-9][0-9][0-9][0-9]-0[45]00* ]]; then
+ pre="${line%%20[0-9][0-9][0-9][0-9][0-9][0-9]T[0-9][0-9][0-9][0-9][0-9][0-9]-0[45]00*}"
+ post="${line##*20[0-9][0-9][0-9][0-9][0-9][0-9]T[0-9][0-9][0-9][0-9][0-9][0-9]-0[45]00}"
+ mid="${line:${#pre}:22}"
+ echo "$pre$(btrbk-date "$mid")$post"
+ else
+ echo "$line"
+ fi
+ done
+}
+jrbtrbk() {
+ jr -u btrbk-run -u btrbk -u switch-mail-host "$@"
+}
+
+# internal function
+btrbk-host-debug-show-host() {
+ for f; do
+ snaphost=
+ for host in $remote $alt local; do
+ if line=$(grep -P "\S*$f" /tmp/b/s/$host.log); then
+ if [[ $snaphost ]]; then
+ e error: snaphost=$snaphost, host=$host line="$line"
+ fi
+ if [[ $line == ssh* ]]; then
+ tmp="${line#ssh://}"
+ snaphost="${tmp%%/*}"
+ else
+ snaphost=$host
+ fi
+ fi
+ done
+ echo $snaphost $f | btrbk-date-sed
+ done
+}
+
+# If we get a btrfs receive error like this:
+# ERROR: ... clone: did not find source subvol
+# running this command will help track down the problem.
+# Alter remote= and alt=. When I used it, remote is
+# the host having the error when I push a snapshot.
+# Alt is just the other host that takes snapshots
+# besides the local host.
+btrbk-host-debug() {
+
+ remote=b8.nz
+ alt=sywg.b8.nz
+
+ mkdir -p /tmp/b/s
+ for host in $remote $alt; do
+ h=$(ssh $host hostname)
+ rsync -a /var/log/btrbk $host:/var/log/btrbk /var/log/btrbk/$h
+ grr '\bsnapshot success' /var/log/btrbk/$h >/tmp/b/$h.log
+
+ ## 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 >/tmp/b/$host.log
+ done
+ gr '\bsnapshot success' /var/log/btrbk/*.log >/tmp/b/local.log
+ cd /tmp/b
+ for f in *.log; do
+ gr '\bsnapshot success' $f >s/$f
+ done
+ cd /mnt/root/btrbk
+ localq=(q.*)
+ declare -A localq_a
+ for f in "${localq[@]}"; do
+ localq_a[$f]=t
+ done
+
+ remoteq=()
+ for f in $(ssh $remote "cd /mnt/root/btrbk; echo q.*"); do
+ if [[ ! ${localq_a[$f]} ]]; then
+ remoteq+=($f)
+ fi
+ done
+ btrbk-host-debug-show-host "${localq[@]}"
+ if (( ${#remoteq[@]} >= 1 )); then
+ echo "=== $remote only ===="
+ btrbk-host-debug-show-host ${remoteq[@]}
+ fi
+
}
# note, to check for glue records
@@ -377,16 +1513,18 @@ bbk() { # btrbk wrapper
if $active; then
ser stop btrbk.timer
fi
- if [[ $(systemctl is-active btrbk.service ||:) != inactive ]]; then
- echo "cron btrbk is already running"
- if $active; then ser start btrbk.timer; fi
- return 1
- fi
- # run latest
- install-my-scripts
+ btrbk_is_active=$(systemctl is-active btrbk.service ||:)
+ case $btrbk_is_active in
+ inactive|failed) : ;;
+ *)
+ echo "bbk: error: systemctl is-active btrbk.service output: $btrbk_is_active"
+ if $active; then ser start btrbk.timer; fi
+ return 1
+ ;;
+ esac
# todo: consider changing this to srun and having the args come
# from a file like /etc/default/btrbk, like is done in exim
- s jrun btrbk-run "$@"
+ s jdo btrbk-run "$@"
if $active; then
if (( ret )); then
echo bbk: WARNING: btrbk.timer not restarted due to failure
@@ -426,40 +1564,148 @@ locat() { # log-once cat
ngreset
}
-# duplicated somewhat below.
-jrun() { # journal run. run args, log to journal, tail and grep the journal.
- # Note, an alternative without systemd would be something like ts.
- # Note, I tried using systemd-cat, but this seems obviously better,
- # and that seemed to have a problem exiting during a systemctl daemon-reload
- local cmd_name jr_pid s
+scr() {
+ screen -RD "$@"
+}
+
+# usage: first get an adb shell on the phone.
+#
+# just followed instructions in readme at
+# https://github.com/Yuubi-san/ceb-tools
+# tried to use ceb2txt but it failed because of schema
+# slightly different than what it expected.
+cheogram-get-logs() {
+ #adb shell rm -r /storage/emulated/0/Download/Cheogram/Backup
+ read -r -p "do cheogram backup on phone, do not enable extra cheogram data. press any key when done"
+ cd /p/cheogram
+ rm -rf Backup b
+ adb pull /storage/emulated/0/Download/Cheogram/Backup
+ sqlite3 b $(( (EPOCHSECONDS - days * 60 * 60 * 24) * 1000 ))
+order by timeSent;"
+ sqlite3 /p/cheogram/b ".mode tabs" "$q" | less
+}
+
+mycheologs() {
+ local days q
+ days=${1:-16}
+ # timezone compared to utc. note: this takes the current offset, so if daylight savings change
+ # happened in the looking back period, this won't account for it.
+ zone_offset=$(( $( date +%z | sed 's/[^1-9-]*//g' ) * 60 * 60))
+ case $zone_offset in
+ -*) : ;;
+ *) zone_offset="+ $zone_offset"
+ esac
+ echo zone_offset=$zone_offset
+ q="
+select
+ datetime(substr(timeSent,0,11) $zone_offset, 'unixepoch'),
+ body
+from messages
+where timeSent > $(( (EPOCHSECONDS - days * 60 * 60 * 24) * 1000 ))
+and counterpart = 'office@conference.fsf.org/iank'
+order by timeSent;"
+ sqlite3 /p/cheogram/b ".mode tabs" "$q" | sed 's/ /./' | less
+}
+
+# version of jdo for my non-root user
+jdo() {
+ # comparison of alternative logging methods:
+ #
+ # systemd-run command (what this function does)
+ #
+ # If there is a user prompt, the program will detect that it is not
+ # connected to a terminal and act in a non-interactive way, skipping
+ # the prompt. This has the benefit that you know exactly how the
+ # program will act if you want to move it into a service that runs
+ # automatically.
+ #
+ # If run with sudo and command is a shell script which does a sleep,
+ # it can (sometimes?) output some extra whitespace in front of
+ # messages, more for each subsequent message. This can be avoided by
+ # becoming root first.
+ #
+ # It logs the command's pid and exit code, which is nice.
+ #
+ #
+ ### command |& ts | tee file.log
+ #
+ # If there is a user prompt, like "read -p prompt var", it will hang
+ # without outputting the prompt.
+ #
+ # I've had a few times where ts had an error and I wasn't totally sure
+ # if it was really the command or ts having the problem.
+ #
+ # Sometimes some output will get hidden until you hit enter.
+ #
+ #
+ ### command |& pee cat logger
+ #
+ # This seems to work. I need to test more.
+ #
+ #
+ ### command |& logger -s
+ #
+ # User prompts get confusingly prefixed to earlier output, and all log
+ # entries get prefixed with annoying priority level.
+ #
+ #
+ ### systemd-cat
+ #
+ # Had a few problems. One major one is that it exited in the middle of
+ # a command on systemctl daemon-reload
+ #
+ # Related commands which can log a whole session: script, sudo, screen
+ local cmd cmd_name jr_pid ret
ret=0
- cmd_name=${1##*/}
- cmd=$1
+ cmd="$1"
+ shift
+ cmd_name=${cmd##*/}
if [[ $cmd != /* ]]; then
- cmd=$(which $1)
+ cmd=$(type -P "$cmd")
fi
+ # -q = quiet
journalctl -qn2 -f -u "$cmd_name" &
- # Guess of time needed to avoid missing initial lines.
+ # Trial and error of time needed to avoid missing initial lines.
# .5 was not reliable. 1 was not reliable. 2 was not reliable
- sleep 3
- # We kill this in prompt-command for the case that we ctrl-c the
- # systemd-cat. i dont know any way to trap ctrl-c and still run the
- # normal action for it. There might be a way, unsure.
+ sleep 4
jr_pid=$!
# note, we could have a version that does system --user, but if for example
# it does sudo ssh, that will leave a process around that we can't kill
# and it will leave the unit hanging around in a failed state needing manual
# killing of the process.
- m s systemd-run --uid $(id -u) --gid $(id -g) \
+ s systemd-run --uid "$(id -u)" --gid "$(id -g)" \
-E SSH_AUTH_SOCK=/run/openssh_agent \
- --unit "$cmd_name" --wait --collect "$cmd" "${@:2}" || ret=$?
- # This justs lets the journal output its last line
+ --unit "$cmd_name" --wait --collect "$cmd" "$@" || ret=$?
+ # The sleep lets the journal output its last line
# before the prompt comes up.
sleep .5
kill $jr_pid &>/dev/null ||:
unset jr_pid
fg &>/dev/null ||:
+ # this avoids any err-catch
+ (( ret == 0 )) || return $ret
}
+
# service run, and watch the output
srun() {
local unit
@@ -473,7 +1719,19 @@ srun() {
fg &>/dev/null ||:
}
-sm() {
+sm() { # switch mail host
+ local tmp keyhash
+ c /
+ # run latest
+ keyhash=$(s ssh-keygen -lf /root/.ssh/home | awk '{print $2}')
+ tmp=$(s ssh-add -l | awk '$2 == "'$keyhash'"' ||:)
+ if [[ ! $tmp ]]; then
+ s ssh-add /root/.ssh/home
+ fi
+ s jdo switch-mail-host "$@"
+ return $ret
+}
+sh2() { # switch host2
local tmp keyhash
c /
# run latest
@@ -483,7 +1741,7 @@ sm() {
s ssh-add /root/.ssh/home
fi
install-my-scripts
- s jrun switch-mail-host "$@"
+ s jdo switch-host2 "$@"
return $ret
}
@@ -492,27 +1750,29 @@ lipush() {
# note, i had --delete-excluded, but that deletes all files in --exclude-from on
# the remote site, which doesn't make sense, so not sure why i had it.
local p a
- p=(/a/opt/{emacs-debian11{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
+ # excluding emacs for now
+ #p=(/a/opt/{emacs-debian11{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
+ p=(/a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts} /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter /a/opt/fpaste)
a="-ahviSAXPH --specials --devices --delete --relative --exclude-from=/p/c/li-rsync-excludes"
ret=0
for h in li je bk; do
- m s rsync "$@" $a ${p[@]} /p/c/machine_specific/$h root@$h.b8.nz:/ || ret=$?
- # only li is debian11
- p[0]=/a/opt/emacs-ubuntu20.04
- p[1]=/a/opt/emacs-ubuntu20.04-nox
+ m s rsync "$@" $a ${p[@]} /p/c/machine_specific/$h root@$h.b8.nz:/
+ ## only li is debian11
+ #p[0]=/a/opt/emacs-trisuqel10
+ #p[1]=/a/opt/emacs-trisquel10-nox
done
m s rsync "$@" -ahviSAXPH root@li.b8.nz:/a/h/proposed-comments/ /a/h/proposed-comments || ret=$?
return $ret
}
bkpush() { # no emacs. for running faster.
- p=(/a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
+ p=(/a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts} /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter)
a="-ahviSAXPH --specials --devices --delete --relative --exclude-from=/p/c/li-rsync-excludes"
ret=0
m rsync "$@" $a ${p[@]} /p/c/machine_specific/bk root@bk.b8.nz:/ || ret=$?
return $ret
}
jepush() { # no emacs. for running faster.
- p=(/a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
+ p=(/a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts} /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter)
a="-ahviSAXPH --specials --devices --delete --relative --exclude-from=/p/c/li-rsync-excludes"
ret=0
m rsync "$@" $a ${p[@]} /p/c/machine_specific/je root@je.b8.nz:/ || ret=$?
@@ -523,33 +1783,37 @@ bindpush() {
dsign iankelling.org expertpathologyreview.com zroe.org amnimal.ninja
lipush
for h in li bk; do
- m sl $h <<'EOF'
-source ~/.bashrc
-m dnsup
-EOF
+ m ssh $h.b8.nz dnsup
done
}
bindpushb8() {
lipush
for h in li bk; do
- m sl $h <<'EOF'
-source ~/.bashrc
-m dnsb8
-EOF
+ m ssh $h.b8.nz dnsb8
done
}
dnsup() {
conflink -f
- m ser reload bind9
+ m ser reload named
}
dnsb8() {
local f=/var/lib/bind/db.b8.nz
- m ser stop bind9
- m sleep 1
- m sudo rm -fv $f.jnl
+ m ser stop named
+ # jbk is like a temp file. dunno if removing it helps
+
+ i=0
+ while pgrep '^named$' &>/dev/null; do
+ sleep .5
+ i=$(( i + 1 ))
+ if (( i > 100 )); then
+ echo "dnsb8: error: timeout waiting for named to exit"
+ return 1
+ fi
+ done
+ m sudo rm -fv $f.jnl $f.signed.jnl $f.jbk
m sudo install -m 644 -o bind -g bind /p/c/machine_specific/vps/bind-initial/db.b8.nz $f
- m ser restart bind9
+ m ser restart named
}
dnsecgen() {
# keys generated like this
@@ -564,7 +1828,7 @@ dnsecgen() {
local zone=$1
dnssec-keygen -a RSASHA256 -b 2048 $zone
dnssec-keygen -f KSK -a RSASHA256 -b 4096 $zone
- for f in K$zone.*.key; do
+ for f in K"$zone".*.key; do
# eg Kb8.nz.+008+47995.key tag=47995
# in dnsimple, you add the long string from this.
# in gandi, you add the long string from the .key file,
@@ -575,7 +1839,7 @@ dnsecgen() {
# For b8.nz, we let bind read the keys and sign, and
# right now they have root ownership, so let them
# get group read.
- chmod g+r *.private
+ chmod g+r ./*.private
}
dsign() {
# create .signed file
@@ -588,13 +1852,22 @@ dsign() {
done
}
+# set day start for use in other programs.
+# expected to do be in a format like 830, or 800 or 1300.
+ds() {
+ if [[ $1 ]]; then
+ echo $1 >/b/data/daystart
+ else
+ cat /b/data/daystart
+ fi
+}
#### begin bitcoin related things
btc() {
local f=/etc/bitcoin/bitcoin.conf
# importprivkey will timeout if using the default of 15 mins.
# upped it to 1 hour.
- bitcoin-cli -rpcclienttimeout=60000 -$(s grep rpcuser= $f) -$(s grep rpcpassword= $f) "$@"
+ bitcoin-cli -rpcclienttimeout=60000 -"$(s grep rpcuser= $f)" -"$(s grep rpcpassword= $f)" "$@"
}
btcusd() { # $1 btc in usd
local price
@@ -622,6 +1895,74 @@ satoshi() { # $1 satoshi in usd
printf "$%.2f\n" "$(echo "scale=10; $price * $1"| bc -l)"
fi
}
+
+# Bitcoin holds open the wallet file. this causes problems for a
+# secondary computer running bitcoin and receiving a backup (as of
+# 2023). However, in 2024-02, I ran a backup where a receiving machine
+# had the wallet enabled and there was no error, so I don't know if this
+# is still an issue or likely it is an inconsistent behavior.
+#
+# As a workaround, this function is for enabling the wallet when I want
+# to use it and leave it disabled otherwise.
+walleton() {
+ local active
+ active=false
+ no_on=true
+ if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
+ if systemctl --quiet is-active bitcoind; then
+ if [[ -e /tmp/no-bitcoinon ]]; then
+ no_on=true
+ else
+ if [[ $EUID == 0 ]]; then
+ m install -T -o iank -g iank /dev/null /tmp/no-bitcoinon
+ else
+ m touch /tmp/no-bitcoinon
+ fi
+ fi
+ active=true
+ m ser stop bitcoind
+ fi
+ m s ln -s /q/wallets /var/lib/bitcoind
+ sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
+ if $active; then
+ m ser start bitcoind
+ if ! $no_on; then
+ m rm /tmp/no-bitcoinon
+ fi
+ fi
+ fi
+}
+walletoff() {
+ local active
+ active=false
+ no_on=true
+ if [[ $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
+ if systemctl --quiet is-active bitcoind; then
+ if [[ -e /tmp/no-bitcoinon ]]; then
+ no_on=true
+ else
+ if [[ $EUID == 0 ]]; then
+ m install -T -o iank -g iank /dev/null /tmp/no-bitcoinon
+ else
+ m touch /tmp/no-bitcoinon
+ fi
+ fi
+ active=true
+ m ser stop bitcoind
+ else
+ echo note: bitcoind not active
+ fi
+ m rm /var/lib/bitcoind/wallets
+ if $active; then
+ # note, starting bitcoin always fails, but it actually
+ # succeeds. But this is strangely not consistent.
+ m ser start bitcoind
+ if ! $no_on; then
+ m rm /tmp/no-bitcoinon
+ fi
+ fi
+ fi
+}
#### end bitcoin related things
@@ -647,13 +1988,78 @@ capache()
fi
}
+
+
+apache-header() {
+ # First paragraph is to avoid people being confused about why a
+ # file is apache licensed.
+ cat <<'EOF'
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+EOF
+
+}
+
+# apply apache to git tracked bash files + README, except files with A?GPL3 header.
+apache-apply-repo() {
+ for f in $(git ls-files); do
+ [[ -L $f || ! -f $f ]] && continue
+ if [[ $f != README ]]; then
+ if ! grep -n '^#!/bin/bash' $f | grep ^1: &>/dev/null; then continue; fi
+ if head -n 10 $f | grep 'it under the terms of the GNU General Public License as published by' &>/dev/null; then continue; fi
+ fi
+ apache-apply $f
+ done
+}
+
+apache-apply() {
+ for file; do
+ if head -n1 "$file"| grep -E '^#!/bin/bash\b' &>/dev/null; then
+ {
+ head -n1 "$file"
+ apache-header
+ tail -n+2 "$file"
+ } | sponge "$file"
+ else
+ {
+ apache-header
+ cat "$file"
+ } | sponge "$file"
+ fi
+ done
+}
+# strip out the apache license from a file.
+apache-strip() {
+ # shellcheck disable=SC2044 # meh
+ for f in $(find . -type f -maxdepth 1); do if head -n1 "$f"| grep -E '^#!/bin/bash\b' &>/dev/null; then { head -n 20 $f | tac | sed '/^# limitations under the License.$/,/^# Copyright.*Ian Kelling$/d' | tac; tail -n+21 $f; } |sponge $f; fi ; done
+}
+
chrome() {
if type -p chromium &>/dev/null; then
cmd=chromium
else
cd /
cmd="schroot -c bullseye chromium"
- CHROMIUM_FLAGS='--enable-remote-extensions' $cmd &r
+ CHROMIUM_FLAGS='--enable-remote-extensions' $cmd & r
fi
}
@@ -695,10 +2101,6 @@ digme() {
digdiff @ns{1,2}.iankelling.org "$@"
}
-tsr() { # ts run
- "$@" |& ts || return $?
-}
-
dup() {
local ran_d
ran_d=false
@@ -861,10 +2263,13 @@ fdup() {
}
firefox-default-profile() {
- key=Default value=1 section=$1
+ local key value section
+ key=Default
+ value=1
+ section=$1
file=/p/c/subdir_files/.mozilla/firefox/profiles.ini
sed -ri "/^ *$key/d" "$file"
- sed -ri "/ *\[$section\]/,/^ *\[[^]]+\]/{/^\s*$key[[:space:]=]/d};/ *\[$section\]/a $key=$value" "$file"
+ sed -ri "/ *\[$section\]/,/^ *\[[^]]+\]/{/^\s*${key}[[:space:]=]/d};/ *\[$section\]/a $key=$value" "$file"
}
fdhome() { #firefox default home profile
firefox-default-profile Profile0
@@ -912,11 +2317,13 @@ fsdiff () {
fi
}
fsdiff-test() {
+ local tmpd x
# expected output, with different tmp dirs
# /tmp/tmp.HDPbwMqdC9/c/d ./c/d
# /a/tmp/tmp.qLDkYxBYPM-missing
# ./b
- cd $(mktemp -d)
+ tmpd="$(mktemp -d)"
+ cd "$tmpd"
echo ok > a
echo nok > b
mkdir c
@@ -927,13 +2334,14 @@ fsdiff-test() {
echo different > $x/c/d
echo ok > $x/a
fsdiff $x
+ rm -r "$x" "$tmpd"
}
rename-test() {
# test whether missing files were renamed, generally for use with fsdiff
# $1 = fsdiff output file, $2 = directory to compare to. pwd = fsdiff dir
# echos non-renamed files
- local x y found
- unset sums
+ local x line found renamed
+ local -a sums
for x in "$2"/*; do
{ sums+=( "$(md5sum < "$x")" ) ; } 2>/dev/null
done
@@ -953,7 +2361,7 @@ rename-test() {
feh() {
# F = fullscren, z = random, Z = auto zoom
- command feh -FzZ "$@"
+ command feh --auto-rotate -FzZ "$@"
}
@@ -976,7 +2384,7 @@ gpg() {
}
gse() {
- local email=ian@iankelling.org
+ local email=iank@fsf.org
git send-email --notes "--envelope-sender=<$email>" \
--suppress-cc=self "$@"
}
@@ -985,11 +2393,11 @@ gup() { /a/f/gnulib/build-aux/gnupload "$@"; }
dejagnu() { /a/opt/dejagnu/dejagnu "$@"; }
+# do git status on published repos.
hstatus() {
- # do git status on published repos.
c /a/bin/githtml
for x in *; do
- cd $(readlink -f $x)/..
+ cd "$(readlink -f $x)"/..
status=$(i status -s) || pwd
if [[ $status ]]; then
hr
@@ -1000,10 +2408,23 @@ hstatus() {
done
}
-# work log
+hsk() {
+ local x
+ c /a/bin/githtml
+ for x in *; do
+ cd "$(readlink -f $x)"/..
+ skgit
+ cd /a/bin/githtml
+ done
+}
+
+## work log
+#
+# note: database location is specified in ~/.timetrap.yml, currently /p/.timetrap.db
wlog() {
- local day now i
- for (( i=0; i<60; i++ )); do
+ local day i days_back
+ days_back=${1:-16}
+ for (( i=days_back; i>=0; i-- )); do
day=$( date +%F -d @$((EPOCHSECONDS - 86400*i )) )
date "+%a %b %d" -d @$((EPOCHSECONDS - 86400*i )) | tr '\n' ' '
/a/opt/timetrap/bin/t d -ftotal -s $day -e $day all -m '^w|lunch$'
@@ -1012,27 +2433,155 @@ wlog() {
to() { t out -a "$@"; }
ti() { t in -a "$@"; }
tl() {
+ local in_secs
to "$*"
t s lunch
t in -a "$*"
- m t out -a $(date +%F.%T -d @$(( $(date -d "$(echo $*|sed 's/[_.]/ /g')" +%s) + 60*45 )) )
+ in_secs="$(date -d "${*//[_.]/ }" +%s)"
+ m t out -a "$(date +%F.%T -d @$(( in_secs + 60*45 )) )"
t s w
}
-arbttlog() { arbtt-dump "$@" | grep -v '( )\|Current Desktop' | sed -rn '/^[^ ]/{N;s/^(.{21})([0-9]*)[0-9]{3}m.*\(\*/\1\2/;s/^(.{21})[0-9]*.*\(\*/\1/;s/\n//;p}' ; }
-idea() {
- /a/opt/idea-IC-163.7743.44/bin/idea.sh "$@" &r
+# help me focus. opens 2 windows.
+focus() {
+ /p/c/proc/focus/linux-amd64/focus &
+ watcharb5
+ kill %%
+}
+
+
+# Display a list of the active window title
+# i've been on with 10 second samples going back
+# 5 minutes. If I've been on one window for 10 seconds
+# or longer, then display the second count.
+#
+# Press any key to exit.
+watcharb5() {
+ local char ret
+ killall arbtt-capture &>/dev/null ||:
+ rm -f ~/.arbtt/capture.log
+ arbtt-capture --sample-rate=10 &
+ while true; do
+ arb5
+ ret=0
+ # i first thought to sleep and capture ctrl-c, but it seems we can't
+ # capture control-c, unless maybe we implement the commands in a
+ # separate script or maybe add err-cleanup to err. Anyways, this
+ # method is superior because any single char exits.
+ read -rsN1 -t 5 char || ret=$?
+ if (( ret == 142 )) || [[ ! $char ]]; then
+ # debug
+ #e ret=$ret char=$char
+ :
+ else
+ killall arbtt-capture ||:
+ return 0
+ fi
+ done
+
+}
+
+arb5() {
+ local i j l sec blanks line
+ local -a arbtt_lines
+ if [[ ! -e ~/.arbtt/capture.log ]]; then
+ sleep 5
+ fi
+ blanks=$(( LINES - 34 ))
+ for (( i=0; i < blanks; i++ )); do
+ echo
+ done
+
+ {
+ i=0
+ j=0
+ # https://stackoverflow.com/questions/56486272/how-to-concat-multiple-fields-to-same-line-with-jq
+ arbtt_lines=$(arbtt-dump -l 30 -t json | \
+ jq -r '.[] | [ ( .inactive / 1000 | floor ) , ( .windows[] | select (.active == true) |.title) ] | @tsv' | tac)
+ for line in "${arbtt_lines[@]}"; do
+ read -r sec l <<<"$line"
+ if (( j >= LINES )); then
+ break
+ fi
+ if (( i % 6 == 0 && i >= 2 )); then
+ j=$(( j + 1 ))
+ echo "## $(( i / 6 + 1 )) ##"
+ fi
+ if (( sec > 10 )); then
+ printf "%3d %s\n" $sec "$l" | sed -r "s/^(.{$COLUMNS}).*/\1/"
+ else
+ printf " %s\n" "$l" | sed -r "s/^(.{$COLUMNS}).*/\1/"
+ fi
+ i=$(( i + 1 ))
+ j=$(( j + 1 ))
+ done
+ while (( j < 34 && j < LINES )); do
+ echo
+ j=$(( j + 1 ))
+ done
+ } | tac
}
+arbttlog() {
+ # from the log, show only the currently active window, and the number of
+ # seconds of input inactivity.
+ arbtt-dump "$@" | grep -v '( )\|Current Desktop' | sed -rn '/^[^ ]/{N;s/^(.{21})([0-9]*)[0-9]{3}m.*\(\*/\1\2/;s/^(.{21})[0-9]*.*\(\*/\1/;s/\n//;p}' ; }
+
+idea() {
+ /a/opt/idea-IC-163.7743.44/bin/idea.sh "$@" & r
+}
+
+ilogs-local() {
+ d=/var/lib/znc/moddata/log/iank/
+ for n in freenode libera; do
+ cd $d/$n
+ hr
+ for x in "#$1/"*; do
+ base=${x##*/}
+ files=()
+ for f in $@; do
+ tmp=\#$f/$base
+ if [[ -e $tmp ]]; then
+ files+=(\#$f/$base)
+ fi
+ done
+ sed \"s/^./${base%log}/\" ${files[@]}|sort -n
+ hr
+ done
+ done
+}
ilogs() {
- ssh root@iankelling.org "cd /var/lib/znc/moddata/log/iank/freenode/ && hr && for x in \#$1/*; do base=\${x##*/}; files=(); for f in $@; do tmp=\#\$f/\$base; if [[ -e \$tmp ]]; then files+=(\#\$f/\$base); fi; done; sed \"s/^./\${base%log}/\" \${files[@]}|sort -n; hr; done"
+ sl root@iankelling.org ilogs-local "$@"
}
+
+ilog-local() {
+ local d chan
+ chan="$1"
+ d=/var/lib/znc/moddata/log/iank/
+ for n in freenode libera; do
+ if [[ ! -d $d$n/"$chan" ]]; then
+ continue
+ fi
+ cd $d$n/"$chan"
+ hr
+ for x in *; do
+ # *** are parts and joins and such, and they make reading hard.
+ # I probably will want to see them sometimes, just have to
+ # remove that part.
+ echo $x; sed "s/^./${x%log}/;/\*\*\*/d" $x; hr;
+ done
+ done
+}
ilog() {
- chan=${1:-#fsfsys}
+ local chan tmpf
+ tmpf=$(mktemp)
+ chan="${1:-#fsfsys}"
# use * instead of -r since that does sorted order
- ssh root@iankelling.org "for n in freenode libera; do cd /var/lib/znc/moddata/log/iank/\$n/$chan && hr && for x in *; do echo \$x; sed \"s/^./\${x%log}/\" \$x; hr; done; done" | less +G
+ sl root@li.b8.nz ilog-local "$chan" > $tmpf
+ less +G $tmpf
+ rm -f $tmpf
}
o() {
@@ -1057,15 +2606,20 @@ ccomp xdg-open o
# jr() { journalctl "$@" | jfilter | less ; }
# jrf() { journalctl -n 200 -f "$@" | jfilter; }
-jr() { journalctl "$@" ; }
-jrf() { journalctl -n 200 -f "$@" ; }
+## old version for model01. i need to get that firmware working again.
+# kff() { # keyboardio firmware flash. you must hold down the tilde key
+# pushd /a/opt/Model01-Firmware
+# # if we didn't want this yes hack, then remove "shell read" from
+# # /a/opt/Kaleidoscope/etc/makefiles/sketch.mk
+# yes $'\n' | VERBOSE=1 make flash
+# popd
+# }
-ccomp journalctl jtail jr jrf
-kff() { # keyboardio firmware flash
- pushd /a/bin/distro-setup/Arduino/Model01-Firmware
- yes $'\n' | make flash
+kff() {
+ pushd /a/opt/Kaleidoscope/examples/Devices/Keyboardio/Model100
+ make flash
popd
}
@@ -1081,20 +2635,271 @@ wgkey() {
wg genkey | tee $name-priv.key | wg pubkey > $name-pub.key
umask $umask_orig
}
+
+host-info-all() {
+ host-info-update
+ bindpushb8
+ wrt-setup
+}
+
+
+# if you change a host's ip, then run
+# bindpushb8
+# wrt-setup
+host-info-update() {
+
+ local -A vpn_ips host_ips host_macs nonvpn_ips all_ips
+ local -a root_hosts nonroot_hosts
+
+ # the hosts with no mac
+ root_hosts=( bk je li b8.nz )
+ for h in ${root_hosts[@]}; do
+ root_hosts+=(${h}ex)
+ done
+ root_hosts+=(cmc)
+
+ while read -r ip host mac opts; do
+ if [[ $ip == *#* || ! $host ]]; then continue; fi
+
+ # opt parsing
+ vpn=false
+ root=false
+ for opt in $opts; do
+ case $opt in
+ user=root)
+ root=true
+ ;;
+ vpn)
+ vpn=true
+ ;;
+ esac
+ done
+
+ all_ips[$host]=$ip
+ if $vpn; then
+ vpn_ips[$host]=$ip
+ else
+ nonvpn_ips[$host]=$ip
+ fi
+ if $root; then
+ # note: the reason we have b8.nz suffix here but not for non_root
+ # hosts is that it is for the User part, the IdentityFile part is
+ # redundant to *.b8.nz. Also note ${host}i, we only setup those for vpn hosts, but there is no harm in overspecifying here.
+ root_hosts+=($host ${host}i $host.b8.nz ${host}i.b8.nz)
+ else
+ nonroot_hosts+=($host ${host}i)
+ fi
+
+ host_ips[$host]=$ip
+ host_macs[$host]=$mac
+ done
/p/c/cmc-firewall-data
+
+
+ local host ipsuf f files
+
+ # shellcheck disable=SC2016 # shellcheck doesnt know this is sed
+ sedi '/edits below here are made automatically/,$d' /p/c/machine_specific/li/filesystem/etc/wireguard/wgmail.conf
+ for host in ${!vpn_ips[@]}; do
+ if [[ ${root_ips[$host]} ]]; then
+ # root machines dont run transmission
+ continue
+ fi
+ ipsuf=${vpn_ips[$host]}
+ wghole $host $ipsuf
+ u /a/bin/ds/machine_specific/$host/filesystem/etc/systemd/system/openvpn-client-tr@.service <&2
+ if (( $# < 2 || $# > 3 )); then
+ e expected 2-3 arg of hostname, ip suffix, and extrahost >&2
return 1
fi
- local host ipsuf umask_orig
+ local host ipsuf umask_orig vpn_allowed
host=$1
ipsuf=$2
+ if [[ $3 ]]; then
+ extrahost=,$3
+ fi
+ for vpn_host in ${!vpn_ips[@]}; do
+ if [[ $vpn_host == "$host" ]]; then
+ continue
+ fi
+ vpn_allowed+=",10.174.${vpn_ips[$vpn_host]}.2/32"
+ done
mkdir -p /p/c/machine_specific/$host/filesystem/etc/wireguard
- cd /p/c/machine_specific/$host/filesystem/etc/wireguard
- umask_orig=$(umask)
- umask 0077
- wg genkey | tee hole-priv.key | wg pubkey > hole-pub.key
- cat >wghole.conf < hole-pub.key
+ fi
+ cat >wghole.conf </dev/null
+ )
+}
+
+
+mns() { # mount namespace
+ ns=$1
+ shift
+ s mkdir -p /root/mount_namespaces
+ if ! sudo mountpoint /root/mount_namespaces >/dev/null; then
+ m sudo mount --bind /root/mount_namespaces /root/mount_namespaces
+ fi
+ m sudo mount --make-private /root/mount_namespaces
+ if [[ ! -e /root/mount_namespaces/$ns ]]; then
+ m sudo touch /root/mount_namespaces/$ns
+ fi
+ if ! sudo mountpoint /root/mount_namespaces/$ns >/dev/null; then
+ m sudo unshare --propagation slave --mount=/root/mount_namespaces/$ns /bin/true
+ fi
+ m sudo -E /usr/bin/nsenter --mount=/root/mount_namespaces/$ns "$@"
+}
+
+mnsd() { # mount namespace + systemd namespace
+ ns=$1
+ unit=$2
+ shift 2
+
+ s mkdir -p /root/mount_namespaces
+ if ! sudo mountpoint /root/mount_namespaces >/dev/null; then
+ m sudo mount --bind /root/mount_namespaces /root/mount_namespaces
+ fi
+ m sudo mount --make-private /root/mount_namespaces
+ if [[ ! -e /root/mount_namespaces/$ns ]]; then
+ m sudo touch /root/mount_namespaces/$ns
+ fi
+ if ! sudo mountpoint /root/mount_namespaces/$ns >/dev/null; then
+ m sudo unshare --propagation slave --mount=/root/mount_namespaces/$ns /bin/true
+ fi
+
+ pid=$(servicepid $unit)
+ tmpf=$(mktemp --tmpdir $unit.XXXXXXXXXX)
+ export -p >$tmpf
+ printf "%s " "${@@Q}" >>$tmpf
+ echo >>$tmpf
+
+ m sudo nsenter -t $pid -n --mount=/root/mount_namespaces/$ns sudo -u $USER -i bash -c ". $tmpf & sleep 1; rm $tmpf"
+}
+
+
+mnsr() { # mns run
+ local ns=$1
+ shift
+ mns $ns sudo -u iank -E env "PATH=$PATH" "$@"
+}
+
+mnsnonetr() {
+ ns=$1
+ lomh
+ if ! s ip netns list | grep -Fx nonet &>/dev/null; then
+ s ip netns add nonet
+ fi
+ mns $ns --net=/var/run/netns/nonet /bin/bash
+ lomh
+}
+
+mnsnonet() {
+ ns=$1
+ lomh
+ if ! s ip netns list | grep -Fx nonet &>/dev/null; then
+ s ip netns add nonet
+ fi
+ mns $ns --net=/var/run/netns/nonet sudo -E -u iank /bin/bash
+ lomh
}
lom() {
+ # l = the loopback device
local l base
+ # get sudo pass cached right away
+ if ! sudo -nv 2>/dev/null; then
+ sudo -v
+ fi
if [[ $1 == /* ]]; then
base=${1##*/}
- if mountpoint -q /mnt/$base; then
+ fs_file=$1
+ if mns $base mountpoint -q /mnt/$base; then
return 0
fi
- l=$(losetup -j $1 | sed -rn 's/^([^ ]+): .*/\1/p' | head -n1 ||:)
+ l=$(losetup -j $fs_file | sed -rn 's/^([^ ]+): .*/\1/p' | head -n1 ||:)
if [[ ! $l ]]; then
l=$(sudo losetup -f)
- m sudo losetup $l $1
+ m sudo losetup $l $fs_file
fi
if ! sudo cryptsetup status /dev/mapper/$base &>/dev/null; then
- if ! sudo cryptsetup luksOpen $l $base; then
+ if ! m sudo cryptsetup luksOpen $l $base; then
m sudo losetup -d $l
return 1
fi
fi
m sudo mkdir -p /mnt/$base
- m sudo mount /dev/mapper/$base /mnt/$base
- m sudo chown $USER:$USER /mnt/$base
+ m mns $base mount /dev/mapper/$base /mnt/$base
+ m mns $base chown $USER:$USER /mnt/$base
+ lomh
else
base=$1
- if mountpoint /mnt/$base &>/dev/null; then
- m sudo umount /mnt/$base
+ if mns $base mountpoint /mnt/$base &>/dev/null; then
+ m mns $base umount /mnt/$base
fi
if sudo cryptsetup status /dev/mapper/$base &>/dev/null; then
if ! m sudo cryptsetup luksClose /dev/mapper/$base; then
@@ -1155,7 +3038,7 @@ lom() {
return 1
fi
fi
- l=$(losetup -l --noheadings | awk '$6 ~ /\/'$1'$/ {print $1}')
+ l=$(losetup -l --noheadings | awk '$6 ~ /\/'$base'$/ {print $1}')
if [[ $l ]]; then
m sudo losetup -d $l
else
@@ -1193,77 +3076,345 @@ mp() {
done
}
-# these might need a mu index or something added.
-mbenable() {
- local mb=$1
- dst=/m/4e/$mb
- src=/m/md/$mb
- [[ -e $src ]] || { echo "src:$src does not exist"; return 1; }
- m mv -T $src $dst
- m ln -s -T $dst $src
-}
-mb2enable() {
- local mb
- for mb; do
- dst=/m/4e2/$mb
- link=/m/md/$mb
- src=/m/md/$mb
- if [[ ! -e $src || -L $src ]]; then
- src=/m/4e/$mb
+# maildir enable
+mdenable() {
+ local md dst ln_path src two
+
+ two=false
+ case $1 in
+ -2) two=true; shift ;;
+ esac
+
+ for md; do
+ src=
+ if $two; then
+ dst=/m/4e2/$md
+ else
+ dst=/m/4e/$md
+ fi
+
+ ln_path=/m/md/$md
+ for d in /m/md/$md /m/4e2/$md; do
+ if [[ -d $d && ! -L $d ]]; then
+ src=$d
+ break
+ fi
+ done
+ if [[ ! $src ]]; then
+ echo "error: could not find $md" >&2
+ return 1
+ fi
+ m mv -T $src $dst
+ m ln -sf -T $dst $ln_path
+ done
+}
+md2enable() {
+ mdenable -2 "$@"
+}
+mddisable() {
+ local md=$1
+ dst=/m/md/$md
+
+ ### begin copied from mdenable, but different d ###
+ for d in /m/4e/$md /m/4e2/$md; do
+ if [[ -d $d && ! -L $d ]]; then
+ src=$d
+ break
+ fi
+ done
+ if [[ ! $src ]]; then
+ echo "error: could not find $md" >&2
+ return 1
+ fi
+ ### end copy from mdenable ###
+
+ if [[ -L $dst ]]; then m rm $dst; fi
+ m mv -T $src $dst
+}
+
+
+mdt() {
+ markdown "$1" >/tmp/mdtest.html
+ firefox /tmp/mdtest.html
+}
+
+mo() { xset dpms force off; } # monitor off
+
+mpvgpu() {
+ # seems to be the best gpu decoding on my nvidia 670.
+ # vlc gets similar or better framerate, but is much darker output on my test movie at least.
+
+
+ case $HOSTNAME in
+ kd)
+ echo 0f | sudo tee -a /sys/kernel/debug/dri/0/pstate
+ ;;
+ esac
+ # going back to the default slow clock, and slower fan:
+ # echo 07 | sudo tee -a /sys/kernel/debug/dri/0/pstate
+ if [[ $DISPLAY ]]; then
+ mpv --vo=vdpau --hwdec=auto "$@"
+ else
+ # waylandvk seems to work the same
+ mpv --gpu-context=wayland --hwdec=auto
+ fi
+}
+
+mpvd() {
+ mpv --profile=d "$@";
+}
+mpva() {
+ mpv --profile=a "$@";
+}
+# mpv all media files in . or $1
+mpvm() {
+ local -a extensions arg
+ # get page source of https://en.wikipedia.org/w/index.php?title=Video_file_format&action=edit
+ # into /a/x.log, then
+ # grep '^| *\.' /a/x.log | sed 's/| *//;s/,//g'
+
+ # note: to join them together for a regex, do:
+ # old=; for e in ${extensions[@]/./}; do if [[ ! $old ]]; then old=$e; continue; fi; echo -n "$old|"; old=$e; done; echo $e
+ extensions=(
+ .webm
+ .mkv
+ .flv
+ .flv
+ .vob
+ .ogv .ogg
+ .drc
+ .gif
+ .gifv
+ .mng
+ .avi
+ .MTS .M2TS .TS
+ .mov .qt
+ .wmv
+ .yuv
+ .rm
+ .rmvb
+ .viv
+ .asf
+ .amv
+ .mp4 .m4p .m4v
+ .mpg .mp2 .mpeg .mpe .mpv
+ .mpg .mpeg .m2v
+ .m4v
+ .svi
+ .3gp
+ .3g2
+ .mxf
+ .roq
+ .nsv
+ )
+ arg=("(" -iname "*${extensions[0]}")
+ for (( i=1 ; i < ${#extensions[@]}; i++ )); do
+ arg+=(-o -iname "*${extensions[i]}")
+ done
+ arg+=(")")
+ dir=${1:-.}
+ # debug:
+ #find $dir "${arg[@]}" -size +200k
+ find $dir "${arg[@]}" -size +200k -exec mpv --profile=d '{}' +
+}
+mpvs() {
+ mpv --profile=s "$@";
+}
+
+myirc() {
+ if [[ ! $1 ]]; then
+ set -- fsfsys
+ fi
+ local -a d
+ d=( /var/lib/znc/moddata/log/iank/{freenode,libera} )
+ # use * instead of -r since that does sorted order
+ ssh root@iankelling.org "for f in ${d[*]}; do cd \$f/#$1; grep '\ 15 )); then
+ i=$(( logcount - 15 ))
+ else
+ i=0
+ fi
+ # usually do this on monday, sometimes later
+ if [[ $(date +%A) == Monday ]]; then
+ min_date=$(date -d 'monday 2 weeks ago' +%s)
+ else
+ min_date=$(date -d 'monday 3 weeks ago' +%s)
+ fi
+ for (( ; i < logcount; i++ )); do
+ log=${logs[$i]}
+ d=$(date -d "$(head -n1 $log|awk '{print $1}')" +%s)
+ if (( d < min_date )); then
+ continue
+ fi
+ if awk '$3 == "iank:"' $log | sed -r 's/^(.{10}).(.{8})[^ ]+(.*)/\1_\2\3/' | grep .; then
+ hr
fi
- [[ -e $src ]] || { echo "src:$src does not exist"; return 1; }
- m mv -T $src $dst
- m ln -sf -T $dst $link
done
-}
-mbdisable() {
- local mb=$1
- dst=/m/md/$mb
- src=/m/4e/$mb
- set -x
- [[ -e $src ]] || { set +x; return 1; }
- if [[ -L $dst ]]; then rm $dst; fi
- mv -T $src $dst
- set +x
+ popd
}
-mdt() {
- markdown "$1" >/tmp/mdtest.html
- firefox /tmp/mdtest.html
+# Tail all recent prof logs. Copying from profanity has unwanted line breaks
+# especially for links.
+profr() {
+ case $HOSTNAME in
+ kd)
+ profr-local
+ ;;
+ *)
+ ssh b8.nz profr-local
+ ;;
+ esac
}
-mo() { xset dpms force off; } # monitor off
+profr-local() {
+ local d0 d1
+ local -a files
+ d0="$(date +%Y_%m_%d).log"
+ d1="$(date -d '1 day ago' +%Y_%m_%d).log"
+ ngset
+ files=(/d/p/profanity/chatlogs/iank_at_fsf.org/{*,rooms/*}/{$d0,$d1})
+ ngreset
+ if (( ${#files[@]} > 0 )); then
+ cat "${files[@]}" | sort | tail -n 40
+ fi
+}
-mpvd() {
- mpv --profile=d "$@";
+
+# Tail pms in the last day, for the case where we restart profanity and
+# didn't check for pms beforehand. Assume the most recent logs are on kd.
+# If that isn't the case, use prof-recent-local
+prof-recent() {
+ case $HOSTNAME in
+ kd)
+ prof-recent-local
+ ;;
+ *)
+ ssh b8.nz prof-recent-local
+ ;;
+ esac
}
-mpvs() {
- mpv --profile=s "$@";
+prof-recent-local() {
+ 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)" )
+ for d in /d/p/profanity/chatlogs/iank_at_fsf.org/!(rooms); do
+ files=()
+ for date in ${dates[@]}; do
+ f=$d/$date.log
+ if [[ -e $f ]]; then
+ files+=($f)
+ fi
+ done
+ if (( ${#files[@]} >= 1 )); then
+ cat ${files[@]} | tail
+ hr
+ fi
+ done
}
-myirc() {
- if [[ ! $1 ]]; then
- set -- fsf-office
- fi
- local d1 d2
- d=( /var/lib/znc/moddata/log/iank/{freenode,libera} )
- # use * instead of -r since that does sorted order
- ssh root@iankelling.org "for f in ${d[@]}; do cd \$f/#$1; grep '\= 2 )); then
+ echo "error: iank: unexpected multiple files"
+ return 1
+ fi
+ fname="${fnames[0]}"
+ src=/a/opt/roms/$fname
+ if [[ ! -f $src ]]; then
+ echo debvm: not found $src, download from eg: https://cloud.debian.org/images/cloud/buster/latest/
+ return 1
+ fi
+ cp -a $src /t
+ # note, in fai-revm we do this: not sure why, maybe because of br device
+ # --graphics spice,listen=0.0.0.0
+ m s virt-install --osinfo debian11 --rng /dev/urandom -n deb${ver}tmp --import -r $ram --vcpus 2 --disk /t/$fname --graphics spice
+ # note: to ssh into this machine will require host key generation: ssh-keygen -A
+
+ # random: for cvs2git on gnu www, use debian 10. I could use trisquel,
+ # but happen to want to try out the debian cloud images. the upstream
+ # requires python2 and hasn't really changed since the version in d10.
+ #
+ # apt install cvs2git cvs
+ # # 7G was not enough
+ # mount -o mode=1777,nosuid,nodev,size=34G -t tmpfs tmpfs /tmp
+ # cvs2git --encoding utf_8 --fallback-encoding ascii --dumpfile=dump www-rsync/www |& tee /tmp/l
+ ## www-rsync is an rsynced copy of the cvsfrom savannah
}
mygajim() {
- local time time_sec time_pretty
+ local time time_sec time_pretty days
+ days=${1:-16}
sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs where contact_name = 'iank' and jid_id = 17;" | while read -r time l; do
case $time in
16*) : ;;
@@ -1276,14 +3427,19 @@ mygajim() {
echo $time_pretty "$l"
time_sec=${time%%.*}
# only look at the last 18 days. generally just use this for timesheet.
- if (( time_sec < EPOCHSECONDS - 60 * 60 * 24 * 18 )); then break; fi
+ if (( time_sec < EPOCHSECONDS - 60 * 60 * 24 * days )); then break; fi
done
}
+allmygajim() {
+ sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs where contact_name = 'iank'" | less
+}
+
gajlogs() {
sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs" | less
}
+
net-dev-info() {
e "lspci -nnk|gr -iA2 net"
lspci -nnk|gr -iA2 net
@@ -1313,10 +3469,19 @@ ngo() {
otp() {
oathtool --totp -b "$*" | xclip -selection clipboard
}
+# run cmd and copy output
j() {
- "$@" |& pee "xclip -r -selection clipboard"
+ "$@" |& pee "xclip -r -selection clipboard" cat
}
+# xorg copy. copy text piped into command
+xc() {
+ xclip -r -selection clipboard
+}
+# echo copy
+ec() {
+ pee "xclip -r -selection clipboard" cat
+}
pakaraoke() {
# from http://askubuntu.com/questions/456021/remove-vocals-from-mp3-and-get-only-instrumentals
@@ -1388,6 +3553,7 @@ rebr() {
}
+r2e() { command r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg "$@"; }
# only run on MAIL_HOST. simpler to keep this on one system.
r2eadd() { # usage: name url
# initial setup of rss2email:
@@ -1406,7 +3572,6 @@ r2eadd() { # usage: name url
# get up to date and dont send old entries now:
r2e run --no-send $1
}
-r2e() { command r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg "$@"; }
rspicy() { # usage: HOST DOMAIN
# connect to spice vm remote host. use vspicy for local host
@@ -1479,21 +3644,12 @@ spd() {
PATH=/usr/local/spdhackfix:$PATH command spd "$@"
}
-spend() {
- sudo systemctl suspend
-}
-
spamf() { # spamtest on FILE
- local spamcpre spamdpid
-
if (( $# != 1 )); then
e spamtest error: expected 1 arg, filename >&2
return 1
fi
-
- spamdpid=$(systemctl status spamassassin| sed -n '/^ *Main PID:/s/[^0-9]//gp')
- spamcpre="nsenter -t $spamdpid -n -m"
- s $spamcpre sudo -u Debian-exim spamassassin -t --cf='score PYZOR_CHECK 0' <"$1"
+ sdncmdroot spamassassin sudo -u Debian-exim spamassassin -t --cf='score PYZOR_CHECK 0' <"$1"
}
@@ -1538,7 +3694,7 @@ To: alerts@iankelling.org
Subject: $*
EOF
else
- read sub
+ read -r sub
{ cat <' $to <
+To: $to
+Subject: Mail delivery failed: returning message to sender
+
+This message was created automatically by mail delivery software.
+EOF
+
+}
+
+
# toggle keyboard
tk() {
# based on
@@ -1630,10 +3855,15 @@ tk() {
tm() {
# timer in minutes
# --no-config
- (sleep $(calc "$* * 60") && mpv --no-config --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
+ (sleep "$(calc "$* * 60")" && mpv --no-config --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
}
+## usage: to connect to my main transmission daemon from a different host, run this
+trans-remote-route() {
+ :
+}
trg() { transmission-remote-gtk & r; }
+# TODO: this wont work transmission.lan doesnt exist
trc() {
# example, set global upload limit to 100 kilobytes:
# trc -u 100
@@ -1663,38 +3893,111 @@ tu() {
$s /a/exe/teeu "$@"
}
+# execute exim in its namespace. Useful args like -Mrm
enn() {
local ecmd pid
ecmd="/usr/sbin/exim4 -C /etc/exim4/my.conf"
if ip a show veth1-mail &>/dev/null; then
s $ecmd "$@"
- return
+ else
+ sdncmdroot exim4 $ecmd "$@"
+ fi
+}
+
+# get pid of systemd service
+servicepid() {
+ local pid unit dir
+ unit="$1"
+ pid=$(systemctl show --property MainPID --value "$unit")
+ case $pid in
+ [1-9]*) : ;;
+ *)
+
+ dir=/sys/fs/cgroup/system.slice
+ if [[ ! -d $dir ]]; then
+ # t10 and older directory.
+ dir=/sys/fs/cgroup/systemd/system.slice
+ fi
+
+ # 0 or empty. This file includes the MainPid, so I expect we
+ # could just get this in the first place, but i don't know if that
+ # is always the case.
+ pid=$(head -n1 $dir/${unit%.service}.service/cgroup.procs)
+ ;;
+ esac
+ if [[ $pid ]]; then
+ printf "%s\n" "$pid"
+ else
+ return 1
fi
- pid=$(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1)
- m s nsenter -t $pid -n -m $ecmd "$@"
}
sdnbash() { # systemd namespace bash
- local unit=$1
- m sudo nsenter -t $(systemctl show --property MainPID --value $unit) -n -m sudo -u $USER -i bash
+ local unit pid
+ if (( $# != 1 )); then
+ echo $0: error wrong number of args >&2
+ return 1
+ fi
+ unit=$1
+ pid=$(servicepid $unit)
+ m sudo nsenter -t $pid -n -m sudo -u $USER -i bash
}
-mailnnbash() {
- m sudo nsenter -t $(systemctl show --property MainPID --value mailnn) -n -m sudo -u $USER -i bash
+sdnbashroot() { # systemd namespace bash as root
+ local unit pid
+ if (( $# != 1 )); then
+ echo $0: error wrong number of args >&2
+ return 1
+ fi
+ unit=$1
+ pid=$(servicepid $unit)
+ m sudo nsenter -t $pid -n -m bash
+}
+
+
+# systemd namespace cmd
+# usage: UNIT CMD...
+sdncmd() {
+ local unit pid tmpf
+ if (( $# <= 1 )); then
+ echo $0: error wrong number of args >&2
+ return 1
+ fi
+ unit=$1
+ shift
+ pid=$(servicepid $unit)
+ tmpf=$(mktemp --tmpdir $unit.XXXXXXXXXX)
+ export -p >$tmpf
+ printf "%s " "${@@Q}" >>$tmpf
+ echo >>$tmpf
+ m sudo nsenter -t $pid -n -m sudo -u $USER -i bash -c ". $tmpf & rm $tmpf"
+}
+
+sdncmdroot() { # systemd namespace root command
+ local unit pid
+ if (( $# < 2 )); then
+ echo $0: error wrong number of args >&2
+ return 1
+ fi
+ unit=$1
+ shift
+ pid=$(servicepid $unit)
+ m sudo nsenter -t $pid -n -m "$@"
}
-mailvpnbash() {
- m sudo nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*mail.conf") -n -m sudo -u $USER -i bash
+
+mailnnbash() {
+ sdnbash mailnn
}
+
+# we use wireguard now, use mailnnbash.
+# mailvpnbash() {
+# m sudo nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*mail.conf") -n -m sudo -u $USER -i bash
+# }
+
eximbash() {
- local pid
- pid=$(pgrep -f "/usr/sbin/exim4 -bd -q30m -C /etc/exim4/my.conf"|h1)
- if [[ ! $pid ]]; then
- echo "eximbash: failed to find exim pid. systemctl -n 30 status exim4:"
- systemctl status exim4
- fi
- m sudo nsenter -t $pid -n -m
+ sdnbashroot exim4
}
spamnn() {
local spamdpid
@@ -1702,33 +4005,30 @@ spamnn() {
m sudo nsenter -t $spamdpid -n -m sudo -u Debian-exim spamassassin "$@"
}
unboundbash() {
- m sudo nsenter -t $(systemctl status unbound| sed -n '/^ *Main PID:/s/[^0-9]//gp') -n -m sudo -u $USER -i bash
+ sdnbashroot unbound
+}
+
+nmtc() {
+ s nmtui-connect "$@"
}
mailnncheck() {
- local p pid ns mailnn
+ local unit pid ns mailnn
# mailvpn would belong on the list if using openvpn
- for p in mailnn unbound dovecot spamassassin exim4 radicale; do
- case $p in
- exim4|radicale)
- pid=$(ps -eo pid,cgroup | grep /system.slice/$p.service | awk '{print $1}')
- ;;
- *)
- pid=$(s systemctl show --property MainPID --value $p)
- ;;
- esac
- echo p=$p pid=$pid
+ for unit in mailnn unbound dovecot spamassassin exim4 radicale; do
+ pid=$(servicepid $unit)
+ echo debug: unit=$unit pid=$pid
if [[ ! $pid ]]; then
- echo failed to find pid for $p
+ echo failed to find pid for unit=$unit
continue
fi
if ! ns=$(s readlink /proc/$pid/ns/net); then
- echo failed to find ns for $p pid=$pid
+ echo failed to find ns for unit=$unit pid=$pid
continue
fi
if [[ $mailnn ]]; then
if [[ $ns != "$mailnn" ]]; then
- echo "$p ns $ns != $mailnn"
+ echo "$unit ns $ns != $mailnn"
fi
else
mailnn=$ns
@@ -1739,20 +4039,13 @@ mailnncheck() {
vpncmd() {
- m sudo -E env "PATH=$PATH" nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf") -n -m "$@"
-}
-vpnf() {
- vpncmd sudo -E -u iank env "PATH=$PATH" abrowser -no-remote -P vpn & r
-}
-vpn2f() {
- vpncmd sudo -u iank env "PATH=$PATH" abrowser -no-remote -P vpn2 & r
+ sdncmd openvpn-client-tr@client.service "$@"
}
-
vpni() {
- vpncmd sudo -u iank env "PATH=$PATH" "$@"
+ sdncmd openvpn-client-tr@client.service bash
}
vpnbash() {
- vpncmd bash
+ sdncmdroot openvpn-client-tr@client.service bash
}
@@ -1778,10 +4071,45 @@ vpn() {
}
fixu() {
+ local stats
ls -lad /run/user/1000
- s chmod 700 /run/user/1000; s chown iank.iank /run/user/1000
+ stats=$(stat -c%a-%g-%u /run/user/1000)
+ if [[ $stats != 700-1000-1000 ]]; then
+ m s chmod 700 /run/user/1000; m s chown iank.iank /run/user/1000
+ fi
+}
+
+# unmute
+um() {
+ local sink card
+ sink=$(pactl get-default-sink)
+ if [[ $sink == auto_null ]]; then
+ # guessing there is just one with an off profile. otherwise we will
+ # need some other solution, like storing the card identifier that we
+ # muted with nap.
+ card=$(pacmd list-cards | sed -n '/^[[:space:]]*index:/{s/^[[:space:]]*index://;h};/^[[:space:]]*active profile: $/{g;p;q}')
+ m pacmd set-card-profile "$card" output:analog-stereo
+ fi
+
+ m pactl set-sink-mute @DEFAULT_SINK@ false
+ rm -f /tmp/ianknap
+}
+
+nap() {
+ local sink card
+ sink=$(pactl get-default-sink)
+ card="${sink%.*}"
+ card="${card/output/card}"
+ m pacmd set-card-profile "$card" off
+
+ # clicking on a link in a browser can cause unmute.
+ # I don't want that. So, use a stronger form of mute
+ # than this.
+ #pactl set-sink-mute @DEFAULT_SINK@ true
+ touch /tmp/ianknap
}
+
# systemctl is-enabled / status / cat says nothing, instead theres
# some obscure symlink. paths copied from man systemd.unit.
# possibly also usefull, but incomplete, doesnt show units not loaded in memory:
@@ -1848,7 +4176,7 @@ sysd-deps() {
fixvpndns() {
local link istls
- read _ link _ istls < <(resolvectl dnsovertls tunfsf)
+ read -r _ link _ istls < <(resolvectl dnsovertls tunfsf)
case $istls in
yes|no) : ;;
*) echo fixvpndns error: unexpected istls value: $istls >&2; return 1 ;;
@@ -1869,19 +4197,45 @@ vpnoffc() { # vpn off client
ser stop openvpn-client-tr@client
}
vpnc() {
- ser start openvpn-client-tr@client
+ local unit
+ unit=openvpn-client-tr@client
+ sudo -v
+ if [[ $(systemctl is-active $unit) != active ]]; then
+ s systemctl start $unit
+ sleep 1
+ fi
}
vspicy() { # usage: VIRSH_DOMAIN
# connect to vms made with virt-install
- spicy -p $(sudo virsh dumpxml "$1"|grep "&2
+ return 1
+ fi
+ sec=$(( EPOCHSECONDS - $( date +%s -d $1am ) ))
+ printf "%d:%02d\n" $(( sec / 60 / 60)) $(( (sec / 60) % 60 ))
+}
+
+calvis() { # calendar visualize
+ install -m 600 /dev/null /tmp/calendar-bytes
+ while read -r l; do
+ for char in $l; do
+ # shellcheck disable=SC2059 # intentional for the hex formatting
+ printf "\x$(printf "%x" $char)" >>/tmp/calendar-bytes
+ done
+ done < <(grep -v '[#-]' /p/calendar-data)
+ /p/c/proc/calendar/linux-amd64/calendar
+}
wtr() { curl wttr.in/boston; }
@@ -1894,14 +4248,116 @@ vrun() {
"$@"
}
-f=/a/f/ansible-configs/files/common/etc/fsf-workstation-bashrc.sh
-if [[ -e $f ]]; then
- # shellcheck disable=SC1090
- source $f
-fi
+electrum() {
+ # https://electrum.readthedocs.io/en/latest/tor.html
+ # https://github.com/spesmilo/electrum-docs/issues/129
+ s rsync -ptog --chown bitcoin:bitcoin ~/.Xauthority /var/lib/bitcoind/.Xauthority
+ sudo -u bitcoin DISPLAY=$DISPLAY XAUTHORITY=/var/lib/bitcoind/.Xauthority /a/opt/electrum-4.2.1-x86_64.AppImage -p socks5:localhost:9050
+}
+monero() {
+ sudo -u bitcoin DISPLAY=$DISPLAY XAUTHORITY=/var/lib/bitcoind/.Xauthority /a/opt/monero-gui-v0.17.3.2/monero-wallet-gui
+}
+
+
+# grep + find
+gef() {
+ faf | grep -E "$@" ||:
+ rgv "$@"
+}
+
+# rg my main files
+rgm() {
+ rg "$@" /p/w.org /a/t.org /a/work.org /b
+}
+
+# re all my files more expansively
+rem() {
+ local paths
+ paths="/p/c /b/"
+ find $paths -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 | grep -iP --color=auto -- "$*" ||:
+ rgv $local_rgv_args -g "!bash_unpublished" -- "$*" $paths /a/work.org ||:
+}
+reml() { # rem with limit to 5 matches per file
+ local_rgv_args="-m 5"
+ rem "$@"
+}
+
+rep() {
+ local paths
+ paths="/p/c"
+ find $paths -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 | grep -iP --color=auto -- "$*" ||:
+ rgv $local_rgv_args -- "$*" $paths /a/t.org /p/w.org ||:
+}
+repl() { # rem with limit to 5 matches per file
+ local local_rgv_args="-m 5"
+ rem "$@"
+}
+
+
+# re on common fsf files
+ref() {
+ local paths
+ paths="/f/gluestick /f/brains /f/s /c"
+ find $paths -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 | grep -iP --color=auto -- "$*" ||:
+ rgv -- "$*" $paths /a/work.org ||:
+}
+# for use in /f/bind
+fupzone() {
+ # shellcheck disable=SC2046 # i want word splitting
+ ./update-zone $(i s | sed -rn 's/.*db\.(.*)/\1/p')
+}
+
+# setup:
+# pip3 install linode-cli
+# linode-cli
+livp9() {
+ local input ip id tmp
+ input=$1
+ if [[ $2 ]]; then
+ id=$2
+ ip=$3
+ else
+ tmp=$(mktemp)
+ echo $tmp
+ linode-cli --json --pretty linodes create --root_pass loxHuceygomGisun | tee $tmp
+ read -r ip id <<<"$(tail -n+2 $tmp | jq -r '.[0].ipv4[0] , .[0].id')"
+ for string in $ip $id; do
+ case $string in
+ [0-9]*) : ;;
+ *)
+ echo "livp9: bad value ip=$ip id=$id input=$input"
+ return 1
+ ;;
+ esac
+ done
+ rm $tmp
+ while true; do
+ if timeout 4 ssh $ip :; then
+ break
+ fi
+ sleep 3
+ done
+ fi
+ ssh $ip <\0
,'
+}
+
reset-xscreensaver() {
# except for spash, i set these by setting gui options in
# xscreensaver-command -demo
@@ -1949,6 +4411,10 @@ EOF
}
+# very useful, copy directory structure 3 deep. add remove /*/ to change level
+# rsync -aivh --exclude '/*/*/*/' -f"+ */" -f"- *" SRC DEST
+
+
# * stuff that makes sense to be at the end
if [[ "$SUDOD" ]]; then
# allow failure, for example if we are sudoing into a user with diffferent/lesser permissions.
@@ -1956,6 +4422,7 @@ if [[ "$SUDOD" ]]; then
unset SUDOD
elif [[ -d /a ]] && [[ $PWD == "$HOME" ]] && [[ $- == *i* ]]; then
cd /a
+ OLDPWD=
fi
@@ -1977,15 +4444,14 @@ mypyenvinit () {
}
-export GOPATH=$HOME/go
-path-add $GOPATH/bin
-path-add /usr/local/go/bin
# 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.15
+
+## i should have documented this...
+# based on https://github.com/keyboardio/Kaleidoscope
export KALEIDOSCOPE_DIR=/a/opt/Kaleidoscope
# They want to be added to the start, but i think
@@ -1997,14 +4463,83 @@ path-add --end $HOME/.cargo/bin
if type -P rg &>/dev/null; then
# --no-messages because of annoying errors on broken symlinks
- rg() { command rg --no-messages -L -i -M 300 --no-ignore "$@" || return $?; }
+ # -z = search .gz etc files
+ # -. = search dotfiles
+ rg() { command rg -. -z --no-messages -L -i -M 900 --no-ignore-parent --no-ignore-vcs -g '!.git' -g '!auto-save-list' -g '!.savehist' "$@" || return $?; }
#fails if not exist. ignore
complete -r rg 2>/dev/null ||:
else
alias rg=grr
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 -n --heading -. -z --no-messages -i -M 900 --no-ignore-parent -g '!.git' -g '!auto-save-list' -g '!.savehist' "$@" || ret=$?
+ return $ret
+}
+
+amall() {
+ echo "$(tput setaf 5 2>/dev/null ||:)â coresite â$(tput sgr0 2>/dev/null||:)"
+ amfsf "$@"
+ echo "$(tput setaf 5 2>/dev/null ||:)â office â$(tput sgr0 2>/dev/null||:)"
+ amoffice "$@"
+}
+amallq() { # amall quiet
+ amfsf "$@"
+ amoffice "$@"
+}
+amfsf() {
+ sedi -r '/alertmanager.url/s/@prom.office/@prom/' ~/.config/amtool/config.yml
+ amtool "$@"
+}
+amoffice() {
+ sedi -r '/alertmanager.url/s/@prom.fsf/@prom.office.fsf/' ~/.config/amtool/config.yml
+ amtool "$@"
+}
+amls() {
+ amall silence query "$@"
+}
+# amtool silence add
+amsa() {
+ amall silence add "$@"
+}
+# amtool silence force
+amsf() {
+ amall silence add x!="1"
+}
+amrmall() {
+ # note: not sure if quoting of this arg is correct
+ amfsf silence expire "$(amfsf silence query -q)"
+ amoffice silence expire "$(amoffice silence query -q)"
+}
+
+
+youtube-dl-update() {
+ sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl
+ sudo chmod a+rx /usr/local/bin/youtube-dl
+}
+
+# https://github.com/yt-dlp/yt-dlp/wiki/Installation
+yt-dlp-update() {
+ sudo curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp
+ sudo chmod a+rx /usr/local/bin/yt-dlp # Make executable
+}
+mpvyt() {
+ mpv --ytdl ytdl_path=/usr/local/bin/yt-dlp "$@"
+}
# taken from default changes to bashrc and bash_profile
path-add --end --ifexists $HOME/.rvm/bin
@@ -2012,6 +4547,112 @@ path-add --end --ifexists $HOME/.rvm/bin
# so its included in overall env
+# ya, hacky hardcoded hostnames in 2023. we could do better
+hssh-update() {
+ local -a failed_hosts hosts
+ case $HOSTNAME in
+ sy|kd)
+ hosts=(
+ kd.b8.nz x3.office.fsf.org syw x2.b8.nz
+ )
+ ;;
+ x3)
+ hosts=(
+ b8.nz sywg.b8.nz
+ )
+ ;;
+ esac
+ for host in ${hosts[@]}; do
+ e $host
+ if ! scp /b/fai/fai/config/files/usr/local/bin/hssh/IANK root@$host:/usr/local/bin/hssh; then
+ failed_hosts+=($host)
+ fi
+ done
+ if (( ${#failed_hosts[@]} >= 1 )); then
+ echo failed_hosts=${failed_hosts[*]}
+ return 1
+ fi
+}
+
+noi3bar() {
+ touch /tmp/noi3bar
+}
+i3bar() {
+ rm -fv /tmp/noi3bar
+}
+
+# example:
+# <#part type="image/jpeg" filename="/home/iank/2023-12-24-ski-trip.jpg" disposition=attachment> <#/part>
+#
+attach-txt() {
+ local f
+ for f; do
+ if [[ ! -s $f ]]; then
+ e "error: empty or non-existent file $f"
+ return 1
+ fi
+ done
+ for f; do
+ echo '<#part type="image/jpeg" filename="'"$(rl "$f")"'" disposition=attachment> <#/part>'
+ done | ec
+}
+
+ctof() {
+ units "tempC($1)" tempF
+}
+
+ftoc() {
+ units "tempF($1)" tempC
+}
+
+# requires dns/firewall setup first
+local-icecast() {
+ web-conf -e ian@iankelling.org -f 8000 - apache2 live.iankelling.org <<'EOF'
+
+AuthType Basic
+AuthName "basic_auth"
+# created with
+# htpasswd -c icecast-fsf-htpasswd USERNAME
+AuthUserFile "/etc/icecast-fsf-htpasswd"
+Require valid-user
+
+
+AuthType Basic
+AuthName "basic_auth"
+AuthUserFile "/etc/icecast-fsf-tech-htpasswd"
+Require valid-user
+
+EOF
+}
+
+# obs screen switching of
+obof() {
+ ls -l /tmp/no-obs-auto-scene-switch
+ touch /tmp/no-obs-auto-scene-switch
+}
+# obs screen switching on
+obon() {
+ ls -l /tmp/no-obs-auto-scene-switch
+ if [[ -e /tmp/no-obs-auto-scene-switch ]]; then
+ rm -f /tmp/no-obs-auto-scene-switch
+ fi
+}
+
+obs-gen-profiles() {
+ local p=/p/c/basic/profiles
+ sed 's/fsf-sysops/fsf-tech/g' $p/fsfsysops/basic.ini >$p/fsftech/basic.ini
+ sed 's/fsf-sysops/fsf/g' $p/fsfsysops/basic.ini >$p/fsf/basic.ini
+}
+
+# terminal clear. like clear, but put the prompt at the bottom,
+# useful for obs streaming the bottom half of a terminal window.
+tclear() {
+ for ((i=0; i