X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc2;h=50ca303938b74a63aa395538d240cb5271a48dcd;hb=72c18f3a6a7f1ed0ca16af654a1f804ab96e1ff9;hp=3a5ab9d59b681d076120e79f887ffbc76d229ff0;hpb=5c8530653c87af3757a2c649772e0405bcd143a0;p=distro-setup diff --git a/brc2 b/brc2 index 3a5ab9d..50ca303 100644 --- a/brc2 +++ b/brc2 @@ -6,7 +6,10 @@ # * settings -if [[ $HISTFILE ]]; then +if [[ $LESSHISTFILE == - ]]; then + HISTFILE= + c() { cd "$@"; } +elif [[ $HISTFILE ]]; then HISTFILE=$HOME/.bh fi @@ -22,6 +25,7 @@ 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) @@ -38,6 +42,7 @@ export WCDHOME=/a case $EUID in 0) + # shellcheck disable=SC2034 # used in brc SL_SSH_ARGS="-F $HOME/.ssh/confighome" ;; esac @@ -54,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 @@ -69,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 @@ -110,6 +120,12 @@ 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 +} slemacs() { local arg rtime v @@ -167,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 ;; @@ -273,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)" } @@ -293,19 +310,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 @@ -367,7 +371,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() { @@ -380,7 +384,484 @@ 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 + path="$*" + else + read -r -p "enter path" path + fi + url=$(readlink -f "$path") + url="https://brains.fsf.org/wiki/${url#*brains/}" + url="${url%.mdwn}" + echo "$url" + +} + +# 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 <&2 + return 1 + fi + ### end arg processing ### + + beetpull + + do_rare_genres=false + volume=70 + read_wait=2 + doplay=true + # because we were destined to run out of single key buttons. + rare_genres=( + jazz + musical + noise + skit + spoken-w + ) + + last_genre_i=$(( ${#common_genres[@]} - 1 )) + buttons=( {a..p} {r..w} 0 {6..9} , . / ) + 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 + # 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 + 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" & + fi + while true; do + char= + if $doplay; then + ret=0 + read -r -N 1 -s -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 bg %% &>/dev/null; then + continue + else + break + fi + fi + else + read -r -N 1 -s char + fi + if [[ $char == $'\n' ]]; then + kill %% ||: &>/dev/null + break + fi + case $char in + ";") + kill %% ||: &>/dev/null + j=$(( j - 2 )) + break + ;; + "'") + if $doplay; then + doplay=false + else + doplay=true + kill %% ||: &>/dev/null + beet play --args=--volume=$volume "id:$id" & + fi + continue + ;; + _) + kill %% ||: &>/dev/null + m beet rm --delete --force "id:$id" + break + ;; + [1-5]) + beet modify -y "id:$id" rating=$char + continue + ;; + -) + volume=$(( volume - 5 )) + if (( volume < 0 )); then + volume=0 + fi + echo volume=$volume + continue + ;; + q) + kill %% ||: &>/dev/null + return + ;; + +) + volume+=5 + if (( volume > 130 )); then + volume=130 + fi + echo volume=$volume + continue + ;; + 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) + # 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 + ;; + 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 beet modify -y "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 beet modify -y "id:$id" "$new_item!" + else + tags+=("$new_item") + m beet modify -y "id:$id" $new_item=t + fi + fi + done + 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() { + if [[ $HOSTNAME == kd ]]; then + return 0 + fi + if [[ ! -e /i ]]; then + s mkdir /i + s chown iank:iank /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 +# 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 } # note, to check for glue records @@ -417,7 +898,7 @@ bbk() { # btrbk wrapper install-my-scripts # todo: consider changing this to srun and having the args come # from a file like /etc/default/btrbk, like is done in exim - s jrun btrbk-run "$@" + s jdo btrbk-run "$@" if $active; then if (( ret )); then echo bbk: WARNING: btrbk.timer not restarted due to failure @@ -457,40 +938,138 @@ 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 /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 @@ -504,7 +1083,7 @@ srun() { fg &>/dev/null ||: } -sm() { +sm() { # switch mail host local tmp keyhash c / # run latest @@ -514,7 +1093,20 @@ sm() { s ssh-add /root/.ssh/home fi install-my-scripts - s jrun switch-mail-host "$@" + s jdo switch-mail-host "$@" + return $ret +} +sh2() { # switch host2 + 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 + install-my-scripts + s jdo switch-host2 "$@" return $ret } @@ -597,7 +1189,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, @@ -608,7 +1200,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 @@ -627,7 +1219,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 @@ -686,7 +1278,7 @@ chrome() { else cd / cmd="schroot -c bullseye chromium" - CHROMIUM_FLAGS='--enable-remote-extensions' $cmd &r + CHROMIUM_FLAGS='--enable-remote-extensions' $cmd & r fi } @@ -894,10 +1486,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 @@ -945,11 +1540,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 @@ -960,6 +1557,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 @@ -1022,7 +1620,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 @@ -1035,8 +1633,9 @@ hstatus() { # work log wlog() { - local day now i - for (( i=0; i<60; i++ )); do + 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 + ) } @@ -1183,6 +1822,7 @@ mnsr() { # mns run mnsnonet() { ns=$1 + lomh if ! s ip netns list | grep -Fx nonet &>/dev/null; then s ip netns add nonet fi @@ -1206,7 +1846,7 @@ lom() { 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 @@ -1264,48 +1904,60 @@ 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 - [[ -e $src ]] || { echo "src:$src does not exist"; return 1; } m mv -T $src $dst - m ln -sf -T $dst $link + m ln -sf -T $dst $ln_path 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 +md2enable() { + mdenable -2 "$@" } -mb2disable() { - local mb=$1 - dst=/m/md/$mb - src=/m/4e2/$mb - set -x - [[ -e $src ]] || { set +x; return 1; } - if [[ -L $dst ]]; then rm $dst; fi - mv -T $src $dst - set +x +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 } @@ -1316,6 +1968,26 @@ mdt() { 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 "$@"; } @@ -1325,6 +1997,9 @@ mpvm() { # 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 @@ -1364,8 +2039,8 @@ mpvm() { arg+=(")") dir=${1:-.} # debug: - #find $dir "${arg[@]}" -size +1M - find $dir "${arg[@]}" -size +1M -exec mpv --profile=d '{}' + + #find $dir "${arg[@]}" -size +200k + find $dir "${arg[@]}" -size +200k -exec mpv --profile=d '{}' + } mpvs() { mpv --profile=s "$@"; @@ -1375,15 +2050,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/ + 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*) : ;; @@ -1405,7 +2121,7 @@ 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 } @@ -1417,6 +2133,7 @@ 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 @@ -1521,6 +2238,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: @@ -1539,7 +2257,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 @@ -1667,7 +2384,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 @@ -1798,7 +2542,7 @@ 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 & } trg() { transmission-remote-gtk & r; } @@ -1873,7 +2617,7 @@ servicepid() { sdnbash() { # systemd namespace bash local unit pid - if (( $# != 0 )); then + if (( $# != 1 )); then echo $0: error wrong number of args >&2 return 1 fi @@ -1882,9 +2626,21 @@ sdnbash() { # systemd namespace bash m sudo nsenter -t $pid -n -m sudo -u $USER -i bash } +sdnbashroot() { # systemd namespace 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 bash +} + + sdncmd() { # systemd namespace cmd local unit pid - if (( $# != 0 )); then + if (( $# <= 2 )); then echo $0: error wrong number of args >&2 return 1 fi @@ -1919,7 +2675,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() { @@ -1953,7 +2709,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() { @@ -1986,8 +2742,12 @@ 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 } # systemctl is-enabled / status / cat says nothing, instead theres @@ -2056,7 +2816,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 ;; @@ -2083,8 +2843,8 @@ vpnc() { vspicy() { # usage: VIRSH_DOMAIN # connect to vms made with virt-install - spicy -p $(sudo virsh dumpxml "$1"|grep "