X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=a8a2de76a3a7ee83dd071229b23a7a3292ebef8f;hb=08b99aa91f2bebb589df97db84e777de9fd28c99;hp=9dda87b0930740b7896e601fd780e452b887dcfc;hpb=563cc41a1f3ddb95bedf595cc249f53aea6629c1;p=distro-setup diff --git a/brc2 b/brc2 index 9dda87b..a8a2de7 100644 --- a/brc2 +++ b/brc2 @@ -42,6 +42,7 @@ export WCDHOME=/a case $EUID in 0) + # shellcheck disable=SC2034 # used in brc SL_SSH_ARGS="-F $HOME/.ssh/confighome" ;; esac @@ -58,9 +59,14 @@ 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 -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 @@ -73,7 +79,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 @@ -177,7 +183,8 @@ rm-docker-iptables() { # 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 ;; @@ -283,10 +290,10 @@ tback() { # 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)" } @@ -377,10 +384,13 @@ 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 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 @@ -392,9 +402,6 @@ iki() { 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 } @@ -415,47 +422,71 @@ beetsmartplaylists() { 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 @@ -464,83 +495,127 @@ beetconvert() { *.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 <$tmpf + beet -c $tmpf modify -y "$@" > >(grep -vFx -e 'ignore_this' -e 'Modifying 1 items.' ||:) + rm "$tmpf" + scrolled+=1 +} + +# Must be called from beetag for variables to be setup +beetag-help() { + # - 3 is just a constant that helps things work in practice. + if [[ $LINES ]] && (( LINES - 3 < scrolled )); then + hr + 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 + echo + cat <<'EOF' +y other genres z fg player ' = toggle play +; previous _ = delete -/+ volume ->/<- skip +EOF + hr + scrolled=10 + fi } # tag with beets. -# usage: beetag QUERY +# usage: beetag [-r] [-s] QUERY # it lists the query, reads an input char for tagging one by one. -# 1-5 = set rating -# a-x 0 6-9 / . , = set genre/playlist. (available buttons: ` \ ) ] [ -# q = quit -# y = toggle to setting rare genres -# z = put the player in the foreground -# enter = next song -# ' = toggle playing of songs, also replays current song if hit twice -# ; = go to previous song -# _ = delete file, remove from library -# -/+ = decrease / increase volume # # 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 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 do_rare_genres read_wait help line lsout tmp ls_line + local escape_char escaped_input expected_input skip_input_regex + local -a pl_tags buttons button_map ids tags rare_genres tmp_tags initial_ls ls_lines local -A button_i - local -i volume - do_rare_genres=false + local -i i j volume scrolled id_count line_int skip_start pre_j_count head_count + + + escape_char=$(printf "\u1b") + scrolled=999 # more than any $LINES + ### begin arg processing ### random=false - volume=70 - read_wait=2 case $1 in -r) random=true shift ;; + -s) + random=false + shift + ;; esac if (( ! $# )); then 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 @@ -549,31 +624,10 @@ beetag() { 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 }" @@ -582,25 +636,44 @@ beetag() { for (( i=0; i<${#buttons[@]}; i++ )); do button_i[${buttons[i]}]=$i done - beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $artist - $album - $title' "$@" - mapfile -t ids < <(beet ls -f '$id' "$@" | { if $random; then sort -R; else cat; fi; } ) - for (( j=0; j<${#ids[@]}; j++ )); do - hr + + # TODO: use shuf --random-source=FILE to save the random sort order + # for reusing later, so we can pickup where we left off in a playlist. + + # shellcheck disable=SC2016 # obvious reason + mapfile -t initial_ls < <(beet ls -f '$id %ifdef{rating,$rating }'"$fstring"'$genre | $artist - $album - $title $length' "$@" | { if $random; then sort -R; else cat; fi; } ) + j=0 + # i only care to see the head of the list. + head_count=$(( LINES - 14 )) + for line in "${initial_ls[@]}"; do + id="${line%% *}" + ids+=("$id") + ls_line="${line#* }" + ls_line="$ls_line $id" + ls_lines+=("$ls_line") + if (( j < head_count )); then + echo "$ls_line" + fi + j=$(( j+1 )) + done + id_count=${#ids[@]} + for (( j=0; j < id_count; j++ )); do id=${ids[j]} - lsout="$(beet ls -f '%ifdef{rating,$rating }'"$fstring"', $genre $id $artist - $album - $title' "id:$id")" + lsout="${ls_lines[j]}" tags=( ${lsout%%,*} ) - printf "%s\n" "$lsout" - for (( i=0; i<${#button_map[@]}; i++ )); do - echo ${buttons[i]} ${button_map[i]} - done + beetag-help + printf "██ %s\n" "$lsout" + scrolled+=1 if $doplay; then - beet play --args=--volume=$volume "id:$id" & + # https://stackoverflow.com/a/7687716 + # note: duplicated down below + { beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null fi while true; do char= if $doplay; then ret=0 - read -r -N 1 -s -t $read_wait char || ret=$? + 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. @@ -612,35 +685,40 @@ beetag() { fi fi else - read -r -N 1 -s char + read -rsN1 char fi + beetag-help if [[ $char == $'\n' ]]; then - kill %% ||: &>/dev/null + # https://stackoverflow.com/a/5722874 + kill %%; wait %% 2>/dev/null ||: break fi case $char in ";") - kill %% ||: &>/dev/null + kill %%; wait %% 2>/dev/null ||: j=$(( j - 2 )) break ;; "'") if $doplay; then + echo "play toggled off" doplay=false else doplay=true - kill %% ||: &>/dev/null - beet play --args=--volume=$volume "id:$id" & + kill %%; wait %% 2>/dev/null ||: + { beet play "--args=--volume=$volume" "id:$id" 2>&1 & } 2>/dev/null fi + scrolled+=1 continue ;; _) - kill %% ||: &>/dev/null + kill %%; wait %% 2>/dev/null ||: m beet rm --delete --force "id:$id" + scrolled+=4 # guessing. dont want to test atm break ;; [1-5]) - beet modify -y "id:$id" rating=$char + beetmq "id:$id" rating=$char continue ;; -) @@ -649,10 +727,11 @@ beetag() { volume=0 fi echo volume=$volume + scrolled+=1 continue ;; q) - kill %% ||: &>/dev/null + kill %%; wait %% 2>/dev/null ||: return ;; +) @@ -661,17 +740,18 @@ beetag() { volume=130 fi echo volume=$volume + scrolled+=1 continue ;; 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 @@ -683,6 +763,7 @@ beetag() { continue ;; z) + scrolled+=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 @@ -690,10 +771,72 @@ beetag() { # 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 ;; + "$escape_char") + expected_input=true + read -rsn2 escaped_input + skip_input_regex="^[0-9]+$" + skip_back=false + case $escaped_input in + '[D') + # skip backward + if (( j == 0 )); then + echo "no earlier songs" + continue + fi + skip_back=true + { + line_int=0 + for (( i=j-1; i >= 0; i-- )); do + echo "$line_int | ${ls_lines[i]}" + line_int+=1 + done + } | less -F + scrolled+=$j + ;; + '[C') + # skip forward, but show the last few songs anyways. + skip_start=0 + if (( j - 3 > skip_start )); then + skip_start=$(( j - 3 )) + fi + { + 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 + scrolled+=$(( id_count - skip_start - 1 )) + ;; + *) + expected_input=false + ;; + esac + if $expected_input; then + read -r skip_input + if [[ $skip_input =~ $skip_input_regex ]]; then + if $skip_back; then + j=$(( j - skip_input - 2 )) + else + 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 + kill %%; wait %% 2>/dev/null ||: + break + fi + fi + ;; esac char_i=${button_i[$char]} new_item=${button_map[$char_i]} @@ -702,7 +845,7 @@ beetag() { continue fi if (( char_i <= last_genre_i )); then - m beet modify -y "id:$id" genre=$new_item + m beetmq "id:$id" genre=$new_item else remove=false tmp_tags=() @@ -715,10 +858,10 @@ beetag() { done if $remove; then tags=("${tags[@]}") - m beet modify -y "id:$id" "$new_item!" + m beetmq "id:$id" "$new_item!" else tags+=("$new_item") - m beet modify -y "id:$id" $new_item=t + m beetmq "id:$id" $new_item=t fi fi done @@ -745,20 +888,47 @@ beetadd() { # 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 @@ -775,28 +945,37 @@ er() { # "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']) @@ -806,6 +985,7 @@ beegenre() { ;; esac fi + rm $tmpf } # note, to check for glue records @@ -894,7 +1074,7 @@ scr() { # 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 @@ -1001,7 +1181,7 @@ jdo() { # 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 @@ -1011,7 +1191,7 @@ jdo() { 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 @@ -1133,7 +1313,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, @@ -1144,7 +1324,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 @@ -1163,7 +1343,7 @@ 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 @@ -1222,7 +1402,7 @@ chrome() { else cd / cmd="schroot -c bullseye chromium" - CHROMIUM_FLAGS='--enable-remote-extensions' $cmd &r + CHROMIUM_FLAGS='--enable-remote-extensions' $cmd & r fi } @@ -1430,10 +1610,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 @@ -1481,11 +1664,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 @@ -1496,6 +1681,7 @@ 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 @@ -1558,7 +1744,7 @@ 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 @@ -1571,7 +1757,7 @@ hstatus() { # work log wlog() { - local day now i days_back + local day i days_back days_back=${1:-16} for (( i=0; i hole-pub.key - cat >wghole.conf < hole-pub.key + cat >wghole.conf </dev/null + ) } @@ -1948,15 +2174,21 @@ myirc() { 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 '\= 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/ @@ -2271,7 +2508,7 @@ To: alerts@iankelling.org Subject: $* EOF else - read sub + read -r sub { cat < /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; } @@ -2561,7 +2799,7 @@ 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 + m sudo nsenter -t "$(systemctl status unbound| sed -n '/^ *Main PID:/s/[^0-9]//gp')" -n -m sudo -u $USER -i bash } nmtc() { @@ -2595,7 +2833,7 @@ mailnncheck() { 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() { @@ -2702,7 +2940,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 ;; @@ -2729,8 +2967,8 @@ vpnc() { vspicy() { # usage: VIRSH_DOMAIN # connect to vms made with virt-install - spicy -p $(sudo virsh dumpxml "$1"|grep "