case $EUID in
0)
+ # shellcheck disable=SC2034 # used in brc
SL_SSH_ARGS="-F $HOME/.ssh/confighome"
;;
esac
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
-fi
+
+# not used
+# if [[ -s /a/opt/alacritty/extra/completions/alacritty.bash ]]; then
+# source /a/opt/alacritty/extra/completions/alacritty.bash
+# fi
+
+
+source /a/bin/ds/beet-data
# * functions
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
# usage mkschroot [-] distro codename packages
# - means no piping in of sources.list
mkschroot() {
- local force=false
+ local sources force repo n distro
+ force=false
while [[ $1 == -* ]]; do
case $1 in
-f) force=true; shift ;;
# s sshfs bu@$host:/bu/home/md /bu/mnt -o reconnect,ServerAliveInterval=20,ServerAliveCountMax=30 -o allow_other
eqgo() {
- enn -M $(exiqgrep -i -r.\*)
+ enn -M "$(exiqgrep -i -r.\*)"
}
eqgo1() {
- enn -M $(exipick -i -r.\*|h1)
+ enn -M "$(exipick -i -r.\*|h1)"
}
# 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 path to url
+# /f/brains/sysadmin/interns/2022/nick_shrader/intro_blog_post.mdwn
+# becomes
+# https://brains.fsf.org/wiki/sysadmin/interns/2022/nick_shrader/intro_blog_post
iki() {
local url path
if [[ $1 ]]; then
url="https://brains.fsf.org/wiki/${url#*brains/}"
url="${url%.mdwn}"
echo "$url"
- # /f/brains/sysadmin/interns/2022/nick_shrader/intro_blog_post.mdwn
- # becomes
- # https://brains.fsf.org/wiki/sysadmin/interns/2022/nick_shrader/intro_blog_post
}
rmdir /tmp/ianbeetstmp
}
-# Export beets ratings into navidrome
-beetrating() {
- local tmp tmpfile myuser userid rating path cpath sqlpath
+# 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
- tmpfile=$(mktemp)
- beet ls -f '$rating $path' ^genre:spoken-w ^genre:skit rating:2..5 >$tmpfile
while read -r rating path; do
- tmp="/i/converted${path#/i/m}"
- cpath="${tmp%.*}.mp3" # converted path
+ 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
+ if [[ $old_rating != "$rating" ]]; then
+ echo "setting rating $old_rating -> $rating $cpath"
# https://stackoverflow.com/a/50317320
- m sqlite3 /i/navidrome/navidrome.db "
+ # 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
- m sqlite3 /i/navidrome/navidrome.db "insert into annotation select '$(uuidgen)', '$userid', id, 'media_file', 0, NULL, $rating, 0, NULL from media_file where path = '$sqlpath';"
+ 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
- #sqlite3 /i/navidrome/navidrome.db "select path from annotation inner join media_file on item_id = id where rating = $r;"
- done <$tmpfile
+ 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() {
- local l query
+beetconvert-rm-extras() {
+ local l tmpf
local -A paths
- query="^genre:spoken-w ^genre:skit ^lesser_version:t ^rating:1"
- # redirect is to avoid printing every file
- beet convert -y $query >/dev/null 2> >(grep -v '^convert: Skipping' ||:)
-
+ 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
*.flac) convertedpath="${convertedpath%.flac}.mp3" ;;
esac
paths[$convertedpath]=t
- done < <(beet ls -f '$path' $query)
+ 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 < <(find /i/converted -path /i/converted/beetsmartplaylists -prune -o \( -type f -print \) -name '*.mp3' -o -name '*.m4a')
- ## end
+ 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 <<EOF
+ - name: $i.m3u
+ query: '${query_str[@]}'
+EOF
+ done
+}
+
+# beet playlist. use beetag with a playlist name
+bpl() {
+ eval beetag "${bpla[$1]}"
}
+complete -W "${!bpla[*]}" bpl
+
# tag with beets.
# usage: beetag QUERY
beetag() {
local last_genre_i fstring tag id char new_item char_i genre tag remove doplay i j random
local do_rare_genres read_wait
- local -a genres pl_tags buttons button_map ids tags rare_genres tmp_tags
+ local -a pl_tags buttons button_map ids tags rare_genres tmp_tags
local -A button_i
local -i volume
- do_rare_genres=false
+
+ ### begin arg processing ###
random=false
- volume=70
- read_wait=2
case $1 in
-r)
random=true
echo beetag: error expected a query arg >&2
return 1
fi
+ ### end arg processing ###
+
+ beetpull
+
+ do_rare_genres=false
+ volume=70
+ read_wait=2
doplay=true
- genres=(
- # gangsta rap / angry rap. something like g-rap would make beet queries for genre:rap include it
- arp
- ambient
- avant
- blues
- classical
- # slow instrumental. todo: reclassify some ambient into this.
- chill
- country
- # like power glove
- dark-wave
- # lyrical edm. todo: some pop needs reclassification to this
- dance
- hardcore
- instrumental
- latin
- metal
- # mq = mac quale. similar to the mr robot soundtracks.
- # slow, foreboding. usually electronic.
- mq
- pop
- rap
- rock
- # like rain by brian crain. mostly slow broody piano
- sleep
- techno
- world
- )
# because we were destined to run out of single key buttons.
rare_genres=(
jazz
skit
spoken-w
)
- pl_tags=(
- ## cross-genre tags that dont really make a playlist
- expl
- # songs i like but they get old fast due to feeling gimicky, or cringy after a while.
- gimicky
- # alternate version of a song we already have which isn't as good
- lesser_version
- # anything sad which i sometimes like or avoid.
- sad
-
- ## playlists
- # intimate, love
- love
- # favorite songs pump up songs
- pump1
- # favorite rap pump up songs, allows more songs than pump1
- pumprap
- # heart rending, spine tickling
- rend
- # for running
- run
- )
- last_genre_i=$(( ${#genres[@]} - 1 ))
+
+ last_genre_i=$(( ${#common_genres[@]} - 1 ))
buttons=( {a..p} {r..w} 0 {6..9} , . / )
- button_map=(${genres[@]} ${pl_tags[@]})
+ button_map=(${common_genres[@]} ${pl_tags[@]})
fstring=
for tag in "${pl_tags[@]}"; do
fstring+="%ifdef{$tag,$tag }"
for (( i=0; i<${#buttons[@]}; i++ )); do
button_i[${buttons[i]}]=$i
done
- beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $artist - $album - $title' "$@"
+ # shellcheck disable=SC2016 # obvious reason
+ beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $artist - $album - $title' "$@" | head -n 100 ||:
+ # shellcheck disable=SC2016 # obvious reason
mapfile -t ids < <(beet ls -f '$id' "$@" | { if $random; then sort -R; else cat; fi; } )
for (( j=0; j<${#ids[@]}; j++ )); do
hr
id=${ids[j]}
+ # shellcheck disable=SC2016 # obvious reason
lsout="$(beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $id $artist - $album - $title' "id:$id")"
tags=( ${lsout%%,*} )
printf "%s\n" "$lsout"
- for (( i=0; i<${#button_map[@]}; i++ )); do
- echo ${buttons[i]} ${button_map[i]}
+ for (( i=0; i<${#button_map[@]}; i++)); do
+ if (( i % 3 == 2 )); then
+ printf "%s %s\n" ${buttons[i]} ${button_map[i]}
+ else
+ printf "%s %-15s" ${buttons[i]} ${button_map[i]}
+ fi
done
if $doplay; then
beet play --args=--volume=$volume "id:$id" &
y)
if $do_rare_genres; then
do_rare_genres=false
- button_map=(${genres[@]} ${pl_tags[@]})
+ 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=$(( ${#genres[@]} - 1 ))
+ last_genre_i=$(( ${#rare_genres[@]} - 1 ))
fi
local -A button_i
for (( i=0; i<${#buttons[@]}; i++ )); do
# input. One idea would be to use a music player like mpd where
# we can send it messages.
if ! fg; then
- sleep_wait=10
+ read_wait=10
fi
continue
;;
# update navidrome music data after doing beets tagging
beet2nav() {
- beetconvert
- beetsmartplaylists
- beetrating
+ 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() {
+ if [[ $HOSTNAME == kd ]]; then
+ return 0
+ fi
if [[ ! -e /i ]]; then
s mkdir /i
s chown iank:iank /i
- sshfs b8.nz:/i /i
+ fi
+ if ! mountpoint /i &>/dev/null; then
+ m sshfs b8.nz:/i /i
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
# "artist:" it is used as the artist instead of each artist in QUERY.
#
beegenre() {
- local artist artregex genre term singleartist
- local -a artists genres terms
+ local count artist artregex genre singleartist tmpf tmpf2
+ local -a artists genres
singleartist=false
case $1 in
artist:*)
singleartist=true
- artist="$term"
+ artist="$1"
+ shift
;;
esac
+ tmpf=$(mktemp)
+ tmpf2=$(mktemp)
if $singleartist; then
- read count genre < <(beet ls -f '$genre' "$artist" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1) ||:
+ # 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")
- read count genre < <(beet ls -f '$genre' "artist::^$artregex$" "${@/#/^}" | sort | uniq -c | sort -n | tail -n1) || continue
+ # 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"
+ echo "beet modify -y $* \"artist::^$artist$\" genre=$genre # $count"
fi
- done < <(beet ls -f '$artist' "$@" | sort -u)
+ done <$tmpf
read -r -N 1 -s -p "Y/n " char
case $char in
[Yy$'\n'])
;;
esac
fi
+ rm $tmpf
}
# note, to check for glue records
# slightly different than what it expected.
cheogram-get-logs() {
adb shell rm -r /storage/emulated/0/Download/Cheogram/Backup
- read -p "do cheogram backup on phone, do not enable extra cheogram data. press any key when done"
+ 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
# 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.
- 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" "$@" || ret=$?
# The sleep lets the journal output its last line
unset jr_pid
fg &>/dev/null ||:
# this avoids any err-catch
- (( $ret == 0 )) || return $ret
+ (( ret == 0 )) || return $ret
}
# service run, and watch the output
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,
# 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
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
else
cd /
cmd="schroot -c bullseye chromium"
- CHROMIUM_FLAGS='--enable-remote-extensions' $cmd &r
+ CHROMIUM_FLAGS='--enable-remote-extensions' $cmd & r
fi
}
}
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
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
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
# 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
# work log
wlog() {
- local day now i days_back
+ local day i days_back
days_back=${1:-16}
for (( i=0; i<days_back; i++ )); do
day=$( date +%F -d @$((EPOCHSECONDS - 86400*i )) )
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
+ /a/opt/idea-IC-163.7743.44/bin/idea.sh "$@" & r
}
+ilogs-local() {
+ 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
+}
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
+ cd $d$n/"$chan" && hr
+ for x in *; do
+ echo $x; sed "s/^./${x%log}/" $x; hr;
+ done
+ done
+}
ilog() {
- chan=${1:-#fsfsys}
+ local chan
+ 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@iankelling.org ilog-local "$chan" | less +G
}
o() {
ccomp journalctl jtail jr jrf
-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
+## 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
+# }
+
+
+kff() {
+ pushd /a/opt/Kaleidoscope/examples/Devices/Keyboardio/Model100
+ make flash
popd
}
host=$1
ipsuf=$2
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 <<EOF
+ (
+ 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 <<EOF
[Interface]
# contents hole-priv.key
PrivateKey = $(cat hole-priv.key)
Endpoint = 72.14.176.105:1194
PersistentKeepalive = 25
EOF
- umask $umask_orig
- # old approach. systemd seems to work fine and cleaner.
- rm -f ../network/interfaces.d/wghole
- cedit -q $host /p/c/machine_specific/li/filesystem/etc/wireguard/wgmail.conf <<EOF || [[ $? == 1 ]]
+ umask $umask_orig
+ # old approach. systemd seems to work fine and cleaner.
+ rm -f ../network/interfaces.d/wghole
+ cedit -q $host /p/c/machine_specific/li/filesystem/etc/wireguard/wgmail.conf <<EOF || [[ $? == 1 ]]
[Peer]
PublicKey = $(cat hole-pub.key)
AllowedIPs = 10.8.0.$ipsuf/32
EOF
- cd - >/dev/null
+ )
}
if [[ ! $1 ]]; then
set -- fsf-office
fi
- local d1 d2
+ 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 '\<iank.*' *; done" | cut --complement -c12-16
+ ssh root@iankelling.org "for f in ${d[*]}; do cd \$f/#$1; grep '\<iank.*' *; done" | cut --complement -c12-16
}
mypidgin() {
c /p/c/.purple/logs/jabber/iank@fsf.org/office@conference.fsf.org.chat
for x in *.html; do html2text -o ${x%.html}.txt $x; done;
- grep -A1 ') iank:' *.txt | sed -r 's/^(.{10})[^ ]*\.txt:\(?([^ ]*)[[:space:]](..). iank:/\1_\2_\3/;s/^[^ ]*\.txt-//;/^--$/d;s/^[^ ]*\.txt:\((.{2}).(.{2}).(.{4}) (.{8}) (.{2})\)?/\3-\1-\2_\4_\5/' | sed -n 'x;1d;0~2{G;s/\n/ /;p};${x;p}'
+ # shellcheck disable=SC2016 # false positive on ${
+ grep -A1 ') iank:' ./*.txt \
+ | sed -r 's/^(.{10})[^ ]*\.txt:\(?([^ ]*)[[:space:]](..). iank:/\1_\2_\3/
+s/^[^ ]*\.txt-//
+/^--$/d
+s/^[^ ]*\.txt:\((.{2}).(.{2}).(.{4}) (.{8}) (.{2})\)?/\3-\1-\2_\4_\5/' \
+ | sed -n 'x;1d;0~2{G;s/\n/ /;p};${x;p}'
}
allmyirc() {
local d
local ver ram fname src
ver=$1
ram=${2:-2024}
- # * is because it might have -backports in the name
- fname=debian-$ver-*nocloud-$(dpkg --print-architecture).qcow2
+ # * is because it might have -backports in the name. we only expect 1 expansion
+ fnames=( debian-$ver-*nocloud-"$(dpkg --print-architecture)".qcow2 )
+ if (( ${#fnames[@]} >= 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/
Subject: $*
EOF
else
- read sub
+ read -r sub
{ cat <<EOF
From: alertme@b8.nz
To: alerts@iankelling.org
Subject: $*
EOF
else
- read sub
+ read -r sub
{ cat <<EOF
From: alertme@b8.nz
To: daylert@iankelling.org
torshell() {
# per man torsocks
- source `type -p torsocks` on
+ # shellcheck disable=SC1090 # expected
+ source "$(type -p torsocks)" on
}
eless2() {
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 &
}
trg() { transmission-remote-gtk & r; }
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
+ m sudo nsenter -t "$(systemctl status unbound| sed -n '/^ *Main PID:/s/[^0-9]//gp')" -n -m sudo -u $USER -i bash
}
nmtc() {
vpncmd() {
- m sudo -E env "PATH=$PATH" nsenter -t $(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf") -n "$@"
+ m sudo -E env "PATH=$PATH" nsenter -t "$(pgrep -f "/usr/sbin/openvpn .* --config /etc/openvpn/.*client.conf")" -n "$@"
}
vpni() {
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 ;;
vspicy() { # usage: VIRSH_DOMAIN
# connect to vms made with virt-install
- spicy -p $(sudo virsh dumpxml "$1"|grep "<graphics.*type='spice'"|\
- sed -r "s/.*port='([0-9]+).*/\1/")
+ spicy -p "$(sudo virsh dumpxml "$1"|grep "<graphics.*type='spice'"|\
+ sed -r "s/.*port='([0-9]+).*/\1/")"
}
wian() {
}
+# rg my main files
+rgm() {
+ rg "$@" /p/pd.org /p/w.org /a/t.org /a/work.org /b
+}
+
reset-konsole() {
# we also have a file in /a/c/...konsole...
local f=$HOME/.config/konsolerc
iankelling.org / git / distro-setup / blobdiff