X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=2a81b25fa369f557d373f431d3c56400f61e9707;hb=9a0f77b0495e6f2643d5646c54b4c99cf3118c67;hp=d54570eff2246ce397daf069d25f5bf11fa92e95;hpb=8d33c68549c02c45ed78a05f7de703a08ec245c6;p=distro-setup diff --git a/brc b/brc index d54570e..2a81b25 100644 --- a/brc +++ b/brc @@ -7,16 +7,16 @@ # so this can set extdebug and avoid the bash debugger. -if [[ -s /a/bin/errhandle/err ]]; then - # shellcheck source=/a/bin/errhandle/err - source /a/bin/errhandle/err +if [[ -s /a/bin/bash-bear-trap/bash-bear ]]; then + # shellcheck source=/a/bin/bash-bear-trap/bash-bear + source /a/bin/bash-bear-trap/bash-bear # wtf, shellcheck doesn't allow disabling warnings in elifs else # bleh shellcheck can't handle disabling in an elif, so nesting this if. # shellcheck disable=SC2154 # set in .bashrc - if [[ -s $bashrc_dir/err ]]; then - # shellcheck source=/a/bin/errhandle/err - source $bashrc_dir/err + if [[ -s $bashrc_dir/bash-bear ]]; then + # shellcheck source=/a/bin/bash-bear-trap/bash-bear + source $bashrc_dir/bash-bear fi fi @@ -128,19 +128,79 @@ fi export SSH_CONFIG_FILE_OVERRIDE=/root/.ssh/confighome + + # emacs has a different default search path than the info command. This -# adds the info defaults to emacs, but not the reverse, because I dun +# adds the info defaults to emacs. This is commented because after +# various upgrades this is no longer a problem: for the directories that +# exist on my system, emacs already includes the ones that info +# searches. +# +# but not the reverse, because I dun # care much about the cli. The search path is only on the cli if you run # "info xxx", or in emacs if you run '(info xxx)', so not that -# important, but might as well fix it. +# important and i don't bother fixing it. + +# # info info says this path is what was compiled, and its not documented +# # anywhere. Through source grepping, i found it in files.h of the info +# # source in trisquel flidas. +# # +# # Trailing : means for emacs to add its own stuff on to the end. +# # +# # A problem with this is that directories which are not readable breaks info. And of course, this hard coding is not nice. +# # I removed PATH from the start, because I've never seen an info file in PATH. And removed ".", because I can just specify the full file name in that case. +# # +# # https://raw.githubusercontent.com/debian-tex/texinfo/master/info/filesys.h +# # + +# # note: to split up the var like this, do: +# # IFS=:; printf '%s\n' $INFOPATH + +# dirs=( +# /usr/local/info +# /usr/info +# /usr/local/lib/info +# /usr/lib/info +# /usr/local/gnu/info +# /usr/local/gnu/lib/info +# /usr/gnu/info +# /usr/gnu/lib/info +# /opt/gnu/info +# /usr/share/info +# /usr/share/lib/info +# /usr/local/share/info +# /usr/local/share/lib/info +# /usr/gnu/lib/emacs/info +# /usr/local/gnu/lib/emacs/info +# /usr/local/lib/emacs/info +# /usr/local/emacs/info +# ) + +# for d in ${dirs[@]}; do +# if [[ -r $d ]]; then +# INFOPATH="$d:$INFOPATH" +# fi +# done +# unset d dirs + + +# note: guix bash config does this automatically. +if [[ $INFOPATH != *: ]]; then + INFOPATH="$INFOPATH:" +fi -# info info says this path is what was compiled, and its not documented -# anywhere. Through source grepping, i found it in filesys.h of the info -# source in trisquel flidas. +# info parameter expansion +# +# info cheat sheet: +# H: see keybinds +# / search, {, }: next/prev match +# ctrl/alt-v scroll forward/backward within this node +# l: go to previous node # -# Traling : means for emacs to add its own stuff on to the end. +info-pe() { + info bash 'Basic Shell Features' 'Shell Expansions' 'Shell Parameter Expansion' +} -export INFOPATH=$PATH:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:.: # for openwrt system that has no stty, this is easier than # guarding every time i use it. @@ -242,6 +302,24 @@ export SL_FILES_DIR=/b/ds/sl/.iank export SL_INFO_DIR=/p/sshinfo +### begin pyenv ### + +# this is adapted from things printed to term after install +# pyenv. commented for now since I'm not actually using pyenv. + +# export PYENV_ROOT="$HOME/.pyenv" +# command -v pyenv &>/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" +# command -v pyenv &>/dev/null && eval "$(pyenv init -)" + + +# output showed this example for pyenv-virtualenv, which i have no idea +# what it is, but leaving it as a comment in case I end up doing python +# dev. + +#eval "$(pyenv virtualenv-init -)" +### end begin pyenv ### + + # * include files @@ -264,8 +342,8 @@ fi # bash: /usr/share/bashdb/bashdb-main.inc: No such file or directory # bash: warning: cannot start debugger; debugging mode disabled if [[ $SOE ]]; then - if [[ -e /a/bin/errhandle/err ]]; then - source /a/bin/errhandle/err + if [[ -e /a/bin/bash-bear-trap/bash-bear ]]; then + source /a/bin/bash-bear-trap/bash-bear fi fi @@ -301,9 +379,8 @@ mysrc /a/bin/distro-functions/src/package-manager-abstractions # * functions -### begin FSF section ### -# use for temporary functions +# temporary functions y() { m "${@//spring/fall}" } @@ -312,15 +389,19 @@ h() { } +### begin FSF section ### + # Comments before functions are meant to be good useful # documentation. If they fail at that, please improve them or send Ian a # note. ## copy bash completion -# Usage: ORIGINAL_COMMAND TARGET_COMMAND... # # It copies how the bash completion works from one command to other -# commands. +# commands. Generally just use within a .bashrc. +# +# Usage: ORIGINAL_COMMAND TARGET_COMMAND... +# ccomp() { local c src src=$1 @@ -335,17 +416,21 @@ ccomp() { eval $c $* } -## directory history tracking and navigation. +## BEGIN functions to change directory better than cd ## +# +# The functions: # -# cd becomes a function, also aliased to c. b to go back, f to go -# forward, cl to list recent directories and choose one. +# c: acts like cd, but stores directory history: you could alias to cd if you wanted. +# b: go back +# f: go forward +# cl: list recent directories and optionally choose one. # -# The finer details you may want to skip: +# Finer details you may want to skip: # -# We also define bl to print the list of back and forward directories. +# bl: print the list of back and forward directories. # -# We keep 2 stacks, forward and back. Unlike with a web browser, the -# forward stack is not erased when going somewhere new. +# We keep 2 stacks of directories, forward and back. Unlike with a web +# browser, the forward stack is not erased when going somewhere new. # # Recent directories are stored in ~/.cdirs. # @@ -447,7 +532,7 @@ f() { # printf "%s\n" "${_dir_forward[-1]}" # fi } -# cd list +# cl = cd list cl() { local i line input start local -A buttondirs alines @@ -477,7 +562,9 @@ cl() { alines[$line]=t buttondirs[${buttons[i]}]="$line" printf "%s %s\n" ${buttons[i]} "$line" - if (( i == ${#buttons[@]} - 1 )); then + # the LINES bit is for when we have a short terminal, just dont print all + # the directories. alternative would be to do something like less the list. + if (( i == ${#buttons[@]} - 1 )) || { [[ $LINES ]] && (( i == LINES - 3 )); }; then break fi i=$(( i + 1 )) @@ -492,7 +579,8 @@ cl() { c "${buttondirs[$input]}" fi } -# back list +# bl = back list. lists the back and forward directories. i tend to +# forget this exists and use cl instead. bl() { local start i j max max=10 @@ -533,6 +621,22 @@ bl() { fi done } +# like running cl a +cla() { + local line + mapfile -t lines <~/.cdirs + start=$(( ${#lines[@]} - 1 )) + for (( j=start; j >= 0; j-- )); do + line="${lines[$j]}" + if [[ ! $line || ! -d "$line" || $line == "$PWD" || line == "$HOME" ]]; then + continue + fi + e "$line" + c "$line" + break + done +} +## END functions to change directory better than cd ## # pee do. run args as a command with output copied to syslog. # @@ -604,6 +708,76 @@ jdo() { (( ret == 0 )) || return $ret } ccomp time jdo + +# standard date as used in logs +datelog() { + date +%Y-%m-%d "$@" +} + +# date in log appropriate format +dtl() { + date "+%F %T" "$@" +} + +# ts formatted +tsf() { + command ts "%F %T" "$@" +} + +# ts log. log command to log file. +# usage: tsl LOG_PATH_PREFIX COMMAND... +# example: tsl /root/command +# log file will be like /root/command-2024-02-10.log +tsl() { + local log_prefix log_path appending ret + if (( $# < 2 )); then + echo "tsl: error: expected >= 2 arguments, got $#" >&2 + return 1 + fi + log_prefix="$1" + if [[ $log_prefix == */* && ! -d ${log_prefix%*/} ]]; then + echo "tsl: error: expected directory at ${log_prefix%*/}" >&2 + return 1 + fi + log_path=$log_prefix-$(date +%Y-%m-%d).log + appending=false + if [[ -s $log_path ]]; then + appending=true + fi + shift + printf "%s\n" "CWD: $PWD, log: $log_path, running $*" | ts "%F %T" | tee -a "$log_path" + ret=0 + "$@" |& ts "%F %T" | tee -a "$log_path" || ret=$? + printf "%s\n" "exit code $ret from command: $*" | ts "%F %T" | tee -a "$log_path" + if $appending; then + printf "%s\n" "note: this log file contains logs before those of previous command" | ts "%F %T" | tee -a "$log_path" + fi +} + +disk-info() { + local cmds cmd + mapfile -t cmds <<'EOF' +tail -n +1 /proc/mdstat /etc/mdadm/mdadm.conf /etc/fstab /etc/crypttab +lsblk +blkid +ls -la /dev/disk/by-id +EOF + + for cmd in "${cmds[@]}"; do + cat <$tmp || [[ $? == 1 ]] # 1 when it doesnt exist in the file + if [[ -s $tmp ]]; then + key=$(sed -r 's/^.*([^ ]+ +[^ ]+) *$/\1/' $tmp) + fi + rm $tmp if [[ $key ]]; then grep -Fv "$key" "$file" | sponge "$file" fi + key= fi - key=$(ssh-keygen -F "$ip_entry" -f $file | sed -r 's/^.*([^ ]+ +[^ ]+) *$/\1/') + tmp=$(mktemp) + ssh-keygen -F "$ip_entry" -f $file >$tmp || [[ $? == 1 ]] + if [[ -s $tmp ]]; then + key=$(sed -r 's/^.*([^ ]+ +[^ ]+) *$/\1/' $tmp) + fi + rm $tmp if [[ $key ]]; then grep -Fv "$key" "$file" | sponge "$file" fi ll ~/.ssh/known_hosts - rootsshsync } -khfix() { # known hosts fix - _khfix_common "$@" || return 1 +khfix-r() { # known hosts fix + root + _khfix-common "$@" || return 1 ssh $1 : + rootsshsync } -khcopy() { - _khfix_common "$@" - ssh-copy-id $1 -} - -# ya, hacky hardcoded hostnames in 2023. we could do better -hssh-update() { - local -a failed_hosts hosts - case $HOSTNAME in - sy|kd) - hosts=( - kd x3.office.fsf.org syw - ) - ;; - 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 +khfix() { + _khfix-common "$@" || return 1 + ssh $1 : } +# copy path into clipboard a() { local x x=$(readlink -nf "${1:-$PWD}") @@ -814,12 +973,17 @@ cf() { done } caf() { - # shellcheck disable=SC2033 + + local file find -L "$@" -type f -not \( -name .svn -prune -o -name .git -prune \ -o -name .hg -prune -o -name .editor-backups -prune \ - -o -name .undo-tree-history -prune \) \ - -exec bash -c '. ~/.bashrc; hr; echo "$1"; hr; cat "$1"' _ {} \; 2>/dev/null - + -o -name .undo-tree-history -prune \) -printf '%h\0%d\0%p\n' | sort -t '\0' -n \ + | awk -F '\0' '{print $3}' 2>/dev/null | while read -r file; do + hr + printf "%s\n" "$file" + hr + cat "$file" + done } ccomp cat cf caf @@ -831,6 +995,10 @@ clc() { echo "scale=3; $x" | bc -l } +cx() { + chmod +X "$@" +} + cam() { git commit -am "$*" } @@ -1379,9 +1547,6 @@ and works in older versions of git which did not have that." g() { - # todo: patch emacs so it will look elsewhere. this is kinda sad: - # https://emacs.stackexchange.com/questions/4253/how-to-start-emacs-with-a-custom-user-emacs-directory - local args gdb=false if [[ $EMACSDIR ]]; then @@ -1404,6 +1569,10 @@ g() { fi fi if [[ $EMACSDIR ]]; then + + # todo: we don't have to alter HOME since emacs 29+, we can set + # user-emacs-directory with the flag --init-directory + # Alter the path here, otherwise the nfs mount gets triggered on the # first path lookup when emacs is not being used. # shellcheck disable=SC2098 disable=SC2097 # false positive @@ -1424,6 +1593,27 @@ g() { fi } +# g pipe. like: cmd | emacs. save cmd output to tmp file, then edit. +gp() { + cat &>/a/tmp/gtmp + g "$@" /a/tmp/gtmp +} +# g log +#like cmd &> tempfile; emacs tempfile +# +# note: a useful workflow for doing mass replace on my files: +# gc rem REGEX +## remove any false positives, or manually edit them. rename files if needed. +# sedi 's/REGEX/REPLACEMENT/' $(gr '^/' /a/tmp/gtmp) +gl() { + "$@" &> /a/tmp/gtmp + g /a/tmp/gtmp +} +# g command substitution +gc() { + g $("$@") +} + # force terminal version gn() { g -n "$@" @@ -1491,7 +1681,86 @@ hlm() { hl "$*"; "$@"; } hrcat() { local f; for f; do [[ -f $f ]] || continue; hr; echo "$f"; cat "$f"; done } +# example usage: +# github-release-dl restic/restic restic_ _linux_amd64.bz2 +# gets a url like: +# https://github.com/restic/restic/releases/download/v0.16.3/restic_0.16.3_linux_amd64.bz2 +github-release-dl() { + local github_path file_prefix file_suffix latest_prefix version redir_path + github_path=$1 + file_prefix=$2 + file_suffix=$3 + if (( $# != 3 )); then + echo "$0: error, expected 3 arguments" >&2 + return 1 + fi + redir_path="https://github.com/$github_path/releases/latest/download/" + latest_prefix=$(curl -s -I "$redir_path" | awk 'tolower($1) == "location:" {print $2}') + # it has a trailing /r at the end. just kill any whitespace. + latest_prefix="${latest_prefix//[$'\t\r\n ']}" + if [[ ! $latest_prefix ]]; then + echo "failed to find latest path. Tried to find case insensitive 'location:' in the curl output:" + m curl -s -I "$redir_path" + return 1 + fi + version="${latest_prefix##*/}" + version="${version#v}" + m wget -- "$latest_prefix/$file_prefix$version$file_suffix" +} + +# examples. +# go-github-install restic/restic restic_ _linux_amd64.bz2 +# go-github-install restic/rest-server rest-server_ _linux_amd64.tar.gz + +# common pattern among go binaries on github +go-github-install() { + local tmpd targetf tmp files src + tmpd=$(mktemp -d) + cd $tmpd + file_prefix=$2 + file_suffix=$3 + tmp="${file_prefix##*[[:alnum:]]}" + targetf="${file_prefix%$tmp}" + echo targetf: $targetf + github-release-dl "$@" + files=(./*) + case $file_suffix in + *.bz2) + bunzip2 -- ./* + ;; + *.tar.gz|*.tgz) + tar -vxzf ./* + ;; + esac + rm -f -- "${files[@]}" + files=(./*) + # Here we detect and handle 2 cases: either we extracted a single + # binary which we have to rename or a folder with a binary named + # $targetf in it which is all we care about. + if (( ${#files[@]} == 1 )) && [[ -f ${files[0]} ]]; then + chmod +x ./* + mv -- ./* /usr/local/bin/$targetf + else + files=(./*/$targetf) + if [[ -f $targetf ]]; then + src=$targetf + elif [[ -f ${files[0]} ]]; then + src="${files[0]}" + fi + chmod +x "$src" + mv -- "$src" /usr/local/bin + fi + cd - >/dev/null + rm -rf $tmpd +} +## 2024: I'm using gh instead of hub, but leaving this just in case. +## I tried the github cli tool (gh) and it seems easier than +## I remember hub. +## +## hub predated github's 2020 official cli tool gh. +## more info at +## https://raw.githubusercontent.com/cli/cli/trunk/docs/gh-vs-hub.md # get latest hub and run it # main command to use: # hub pull-request --no-edit @@ -2018,6 +2287,18 @@ sedi() { sed -i --follow-symlinks "$@" } + + +# todo: test variable assignment with newlines here. +# https://stackoverflow.com/questions/15783701/which-characters-need-to-be-escaped-when-using-bash + +# beware that it only works on the assumption that any special +# characters in the input string are intended to be escaped, not to work +# as special chacters. +shellescape() { + LC_ALL=C sed -e 's/[^a-zA-Z0-9,._+@%/-]/\\&/g; 1{$s/^$/""/}; 1!s/^/"/; $!s/$/"/' +} + rmstrips() { ssh fencepost head -n 300 /gd/gnuorg/EventAndTravelInfo/rms-current-trips.txt | less } @@ -2169,7 +2450,7 @@ skq() { skgit() { local f for f in $(i s | awk '$1 == "modified:" {print $2}'); do - if [[ $(head -n1 "$f") == '#!/bin/bash'* ]]; then + if istext "$f" && [[ $(head -n1 "$f" 2>/dev/null) == '#!/bin/bash'* ]]; then sk $f ||: fi done @@ -2646,14 +2927,19 @@ vmunshare() { } myiwscan() { - # find input, copy to pattern space, when we find the first field, print the copy in different order without newlines. - # instead of using labels, we could just match a line and group, eg: /signal:/,{s/signal:(.*)/\1/h} - sudo iw dev wls1 scan | sed -rn " + local i + interfaces=$(iw dev | awk '$1 == "Interface" {print $2}') + for i in $interfaces; do + echo "myiwscan: considering $i" + # find input, copy to pattern space, when we find the first field, print the copy in different order without newlines. + # instead of using labels, we could just match a line and group, eg: /signal:/,{s/signal:(.*)/\1/h} + sudo iw dev $i scan | sed -rn " s/^\Wcapability: (.*)/\1/;Ta;h;b :a;s/^\Wsignal: -([^.]+).*/\1/;Tb;H;b # padded to min width of 20 :b;s/\WSSID: (.*)/\1 /;T;s/^(.{20}(.*[^ ])?) */\1/;H;g;s/(.*)\n(.*)\n(.*)/\2 \3 \1/gp;b "|sort -r + done } # Run script by copying it to a temporary location first, @@ -2760,6 +3046,8 @@ leap-year() { # on-battery on-bat() { if [[ -e /sys/class/power_supply/AC/online && $(/dev/null; then + echo "$0: error: missing dependency: sudo apt install moreutils" >&2 + return 1 + fi + + for f; do + echo "adding header to $f" + if [[ -s $f ]]; then + f_maybe=("$f") + else + f_maybe=() + fi + cat - "${f_maybe[@]}" < + +Copyright (C) $(date +%Y) Free Software Foundation + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without any warranty. + +Contributions are welcome. See . + +EOF + done +} + + +tsr() { # ts run + "$@" |& ts || return $? +} + + # * misc stuff if $use_color && type -p tput &>/dev/null; then + # this is nice for a dark background terminal: + # https://github.com/trapd00r/LS_COLORS + # I would like if there was something similar for light. + + # the default bold green is too light. + # this explains the codes: https://gist.github.com/thomd/7667642 + export LS_COLORS=ex=1 + term_bold="$(tput bold)" term_red="$(tput setaf 1)" term_green="$(tput setaf 2)" @@ -2900,7 +3236,7 @@ if [[ $- == *i* ]]; then # we happen to be using that terminal, we can just keep working by # entering our next command, even a noop in order to dismiss the # notification, instead of having to explicitly dismiss it. - if [[ ${_psrun[@]} ]]; then + if [[ ${_psrun[*]} ]]; then if (( _psrun_count >= 1 )); then "${_psrun[@]}" ||: