X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=brc;h=08ad4067ce22bdb7d4742cbeb8aa0e8d7ba1d8c7;hp=c9cd4fcee4af66f81029ec406f6007de50d9ae0a;hb=HEAD;hpb=ea108a03dfa2d7f73447c0b14210d766e5ee5d9b diff --git a/brc b/brc index c9cd4fc..7731b9c 100644 --- a/brc +++ b/brc @@ -1,15 +1,42 @@ #!/bin/bash -# Copyright (C) 2019 Ian Kelling -# SPDX-License-Identifier: AGPL-3.0-or-later +# I, Ian Kelling, follow the GNU license recommendations at +# https://www.gnu.org/licenses/license-recommendations.en.html. They +# recommend that small programs, < 300 lines, be licensed under the +# Apache License 2.0. This file contains or is part of one or more small +# programs. If a small program grows beyond 300 lines, I plan to switch +# its license to GPL. + +# Copyright 2024 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # this gets sourced. shebang is just for file mode detection # Use source ~/.bashrc instead of doing bash -l when running a script # so this can set extdebug and avoid the bash debugger. -if [[ -s /a/bin/errhandle/err ]]; then - source /a/bin/errhandle/err -elif [[ -s $bashrc_dir/err ]]; then - # shellcheck source=/a/bin/errhandle/err - source $bashrc_dir/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/bash-bear ]]; then + # shellcheck source=/a/bin/bash-bear-trap/bash-bear + source $bashrc_dir/bash-bear + fi fi # In t8, it runs clear_console for login shells by default. I don't want @@ -120,19 +147,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 + -# 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. +# note: guix bash config does this automatically. +if [[ $INFOPATH != *: ]]; then + INFOPATH="$INFOPATH:" +fi + +# 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. @@ -161,30 +248,12 @@ if [[ $- == *i* ]]; then TERM=xterm-256color fi - if [[ $TERM == alacritty && ! -e /usr/share/terminfo/a/alacritty ]]; then - # todo: we should try installing the alacritty terminfo if it is not found - # https://github.com/alacritty/alacritty/issues/2838 - TERM=xterm-256color - fi - - # copying from the alacritty example above, - if [[ $TERM == xterm-kitty ]]; then - if [[ ! -e /usr/share/terminfo/x/xterm-kitty ]]; then - TERM=xterm-256color - else - if [[ -e /a/opt/kitty/shell-integration/bash/kitty.bash ]]; then - KITTY_SHELL_INTEGRATION=t - source /a/opt/kitty/shell-integration/bash/kitty.bash - fi - fi - fi - # todo: not sure this works in sakura #stty werase undef #bind "\C-w": kill-region # sakura == xterm-256color # konsole == xterm - if [[ $TERM != xterm-kitty && $TERM == xterm* ]]; then + if [[ $TERM == xterm* ]]; then # control + arrow keys. for other terminals, see http://unix.stackexchange.com/questions/10806/how-to-change-previous-next-word-shortcut-in-bash bind '"\e[1;5C": shell-forward-word' 2>/dev/null bind '"\e[1;5D": shell-backward-word' 2>/dev/null @@ -204,15 +273,6 @@ if [[ $- == *i* ]]; then fi -case $TERM in - # fixup broken backspace in chroots - xterm-kitty|alacritty) - chroot() { - TERM=xterm-256color command chroot "$@" - } - ;; -esac - export BC_LINE_LENGTH=0 # ansible option @@ -224,15 +284,36 @@ export PROFILE_TASKS_TASK_OUTPUT_LIMIT=100 # i for insensitive. the rest from # X means dont remove the current screenworth of output upon exit # R means to show colors n things +# a useful flag is -F aka --quit-if-one-screen export LESS=RXij12 export SYSTEMD_LESS=$LESS + export NNN_COLORS=2136 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 if [[ -s $bashrc_dir/path-add-function ]]; then @@ -254,11 +335,14 @@ 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 +# go exists here +path-add --ifexists /usr/local/go/bin + mysrc() { local path dir file @@ -266,8 +350,10 @@ mysrc() { dir=${path%/*} file=${path##*/} if [[ -s $path ]]; then + # shellcheck disable=SC1090 # this is dynamic, shellcheck can't follow it. source $path elif [[ -s $bashrc_dir/$file ]]; then + # shellcheck disable=SC1090 # this is dynamic, shellcheck can't follow it. source $bashrc_dir/$file fi } @@ -276,295 +362,195 @@ mysrc() { mysrc /a/bin/small-misc-bash/ll-function mysrc /a/bin/distro-functions/src/package-manager-abstractions +# things to remember: +# ALT-C - cd into the selected directory +# CTRL-T - Paste the selected file path into the command line +# +# good guide to some of its basic features is the readme file +# https://github.com/junegunn/fzf -# * functions -ccomp() { # copy completion - local src=$1 - local c - shift - if ! c=$(complete -p $src 2>/dev/null); then - _completion_loader $src &>/dev/null ||: - c=$(complete -p $src 2>/dev/null) || return 0 - fi - # remove $src( .*|$) - c=${c% $src} - c=${c%% $src *} - eval $c $* -} - - -..() { c ..; } -...() { c ../..; } -....() { c ../../..; } -.....() { c ../../../..; } -......() { c ../../../../..; } - -chere() { - local f path - for f; do - path=$(readlink -e "$f") - echo "cat >$path <<'EOF'" - cat "$f" - echo EOF - done -} +# if [[ -s /usr/share/doc/fzf/examples/key-bindings.bash ]]; then +# source /usr/share/doc/fzf/examples/key-bindings.bash +# fi +# * functions -# file cut copy and paste, like the text buffers :) -# I havnt tested these. -_fbufferinit() { # internal use - ! [[ $my_f_tempdir ]] && my_f_tempdir=$(mktemp -d) - rm -rf "${my_f_tempdir:?}"/* -} -fcp() { # file cp - _fbufferinit - cp "$@" "$my_f_tempdir"/ -} -fct() { # file cut - _fbufferinit - mv "$@" "$my_f_tempdir"/ -} -fpst() { # file paste - [[ $2 ]] && { echo too many arguments; return 1; } - target=${1:-.} - cp "$my_f_tempdir"/* "$target" -} -_khfix_common() { - local host ip port file key - read -r host ip port < <(timeout -s 9 2 ssh -oBatchMode=yes -oControlMaster=no -oControlPath=/ -v $1 |& sed -rn "s/debug1: Connecting to ([^ ]+) \[([^\]*)] port ([0-9]+).*/\1 \2 \3/p" ||: ) - file=$(readlink -f ~/.ssh/known_hosts) - if [[ ! $ip ]]; then - echo "khfix: ssh failed" - return 1 - fi - if [[ $port != 22 ]]; then - ip_entry="[$ip]:$port" - host_entry="[$host]:$port" - else - ip_entry=$ip - host_entry=$host - fi - tmpfile=$(mktemp) - if [[ $host != $ip ]]; then - key=$(ssh-keygen -F "$host_entry" -f $file | sed -r 's/^.*([^ ]+ +[^ ]+) *$/\1/') - if [[ $key ]]; then - grep -Fv "$key" "$file" | sponge "$file" - fi - fi - key=$(ssh-keygen -F "$ip_entry" -f $file | sed -r 's/^.*([^ ]+ +[^ ]+) *$/\1/') - if [[ $key ]]; then - grep -Fv "$key" "$file" | sponge "$file" - fi - ll ~/.ssh/known_hosts - rootsshsync -} -khfix() { # known hosts fix - _khfix_common "$@" || return 1 - ssh $1 : +# temporary functions +y() { + m "${@//spring/fall}" } -khcopy() { - _khfix_common "$@" - ssh-copy-id $1 +h() { + e "${@//spring/fall}" } -a() { - local x - x=$(readlink -nf "${1:-$PWD}") - # yes, its kinda dumb that xclip/xsel cant do this in one invocation - echo -n "$x" | xclip -selection clipboard - echo -n "$x" | xclip -} -# a1 = awk {print $1} -for field in {1..20}; do - eval a$field"() { awk '{print \$$field}'; }" -done -# h1 = head -n1 -for num in {1..9}; do - eval h$num"() { head -n$num; }" -done +### 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. -hexipv4() { - printf '%d.%d.%d.%d\n' $(echo $1 | sed 's/../0x& /g') -} - -vp9() { - local f out outdir in - outdir=vp9 - case $1 in - --out) - outdir=$2 - shift 2 - ;; - esac - m mkdir -p $outdir - for f; do - out=$PWD/$outdir/$f - in=$PWD/$f - m cd $(mktemp -d) - pwd - m ffmpeg -threads 0 -i $in -g 192 -vcodec libvpx-vp9 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 1 -an -f null /dev/null - m ffmpeg -y -threads 0 -i $in -g 192 -vcodec libvpx-vp9 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 2 -c:a libvorbis -qscale:a 5 $out - cd - - done -} - -utcl() { # utc 24 hour time to local hour 24 hour time - echo "print( ($1 $(date +%z | sed -r 's/..$//;s/^(-?)0*/\1/')) % 24)"|python3 +## copy bash completion +# +# It copies how the bash completion works from one command to other +# commands. Generally just use within a .bashrc. +# +# Usage: ORIGINAL_COMMAND TARGET_COMMAND... +# +ccomp() { + local c src + src=$1 + shift + if ! c=$(complete -p $src 2>/dev/null); then + _completion_loader $src &>/dev/null ||: + c=$(complete -p $src 2>/dev/null) || return 0 + fi + # remove $src( .*|$) + c=${c% "$src"} + c=${c%% "$src" *} + eval $c $* } -declare -a _iankdirf _iankdirb - - -# ## old wcd, to be deleted -# b() { -# # backwards -# c - -# } -# # shellcheck disable=SC2032 -# f() { -# # cd forward -# c + -# } -# cl() { -# # choose recent directory. cl = cd list -# c = -# } -# # c. better cd -# if ! type -t c &>/dev/null; then -# if type -p wcd &>/dev/null; then -# if [[ $LC_INSIDE_EMACS ]]; then -# c() { wcd -c -z 50 -o "$@"; } -# else -# # lets see what the fancy terminal does from time to time -# c() { wcd -c -z 50 "$@"; } -# fi -# else -# c() { cd "$@"; } -# fi -# fi - -# c. better cd. -# keep 2 stacks, forward and back. the top of the back is $PWD -# as long as the last directory change was due to c,b,or cl. +## BEGIN functions to change directory better than cd ## +# +# The functions: +# +# 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. +# +# Finer details you may want to skip: +# +# bl: print the list of back and forward directories. +# +# 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. +# +declare -a _dir_forward _dir_back c() { - # normally, the top of dirb is our current dir. if it isn't, + # normally, the top of _dir_back is our current dir. if it isn't, # put it on there, except we don't want to do that when we # just launched a shell if [[ $OLDPWD ]]; then - if (( ${#_iankdirb[@]} == 0 )) || [[ ${_iankdirb[-1]} != "$PWD" ]]; then - _iankdirb+=("$PWD") + if (( ${#_dir_back[@]} == 0 )) || [[ ${_dir_back[-1]} != "$PWD" ]]; then + _dir_back+=("$PWD") fi fi - cd "$@" - if (( ${#_iankdirb[@]} == 0 )) || [[ ${_iankdirb[-1]} != "$PWD" ]]; then - _iankdirb+=("$PWD") + command cd "$@" + if (( ${#_dir_back[@]} == 0 )) || [[ ${_dir_back[-1]} != "$PWD" ]]; then + _dir_back+=("$PWD") fi - echo "$PWD" >> ~/.iankdirs + echo "$PWD" >> ~/.cdirs } ccomp cd c +# back b() { - local topb - if (( ${#_iankdirb[@]} == 0 )); then + local top_back + if (( ${#_dir_back[@]} == 0 )); then echo "nothing left to go back to" >&2 return 0 fi - topb="${_iankdirb[-1]}" + top_back="${_dir_back[-1]}" - if [[ $topb == "$PWD" ]] && (( ${#_iankdirb[@]} == 1 )); then + if [[ $top_back == "$PWD" ]] && (( ${#_dir_back[@]} == 1 )); then echo "already on last back entry" >&2 return 0 fi - if [[ $topb == "$PWD" ]]; then + if [[ $top_back == "$PWD" ]]; then # add to dirf if not already there - if (( ${#_iankdirf[@]} == 0 )) || [[ ${_iankdirf[-1]} != "$topb" ]]; then - _iankdirf+=("$topb") + if (( ${#_dir_forward[@]} == 0 )) || [[ ${_dir_forward[-1]} != "$top_back" ]]; then + _dir_forward+=("$top_back") fi - unset "_iankdirb[-1]" - cd "${_iankdirb[-1]}" + unset "_dir_back[-1]" + command cd "${_dir_back[-1]}" else - if (( ${#_iankdirf[@]} == 0 )) || [[ ${_iankdirf[-1]} != "$PWD" ]]; then - _iankdirf+=("$PWD") + if (( ${#_dir_forward[@]} == 0 )) || [[ ${_dir_forward[-1]} != "$PWD" ]]; then + _dir_forward+=("$PWD") fi - cd "$topb" + command cd "$top_back" fi + # Interesting feature, not sure I want it. # give us a peek at what is next in the list - # if (( ${#_iankdirb[@]} >= 2 )); then - # printf "%s\n" "${_iankdirb[-2]}" + # if (( ${#_dir_back[@]} >= 2 )); then + # printf "%s\n" "${_dir_back[-2]}" # fi -} + # + + # c/b/f Implementation notes: + # + # The top of the back is $PWD + # as long as the last directory change was due to c,b,or cl. + # + # Example of stack changes: + # + # a b c (d) + ## back + # a b (c) + # d + #back + #a (b) + #d c + #back + #(a) + #d c b + #forward + #a (b) + #d c + # + # a b c + ## back + # a b + # (c) + ## forward +} +# forward f() { - local topf - if (( ${#_iankdirf[@]} == 0 )); then + local top_forward + if (( ${#_dir_forward[@]} == 0 )); then echo "no forward dir left" >&2 return 0 fi - topf="${_iankdirf[-1]}" - unset "_iankdirf[-1]" - c "$topf" + top_forward="${_dir_forward[-1]}" + unset "_dir_forward[-1]" + c "$top_forward" # give us a peek at what is next in the list - # if (( ${#_iankdirf[@]} )); then - # printf "%s\n" "${_iankdirf[-1]}" + # if (( ${#_dir_forward[@]} )); then + # printf "%s\n" "${_dir_forward[-1]}" # fi } - -# a b c (d) -## back -# a b (c) -# d -#back -#a (b) -#d c -#back -#(a) -#d c b -#forward -#a (b) -#d c -# -# a b c -## back -# a b -# (c) -## forward - +# cl = cd list cl() { - local i line input start tmpfile + local i line input start local -A buttondirs alines local -a buttons dirs lines buttons=( {a..z} {2..9} ) - if [[ ! -s ~/.iankdirs ]]; then - echo nothing in ~/.iankdirs + if [[ ! -s ~/.cdirs ]]; then + echo nothing in ~/.cdirs return 0 fi i=0 - # note, alternate approach like this, made the following read fail - # done < <(tac ~/.iankdirs | awk '!seen[$0]++') - # bash: read: read error: 0: Input/output error - # which went away by adding a sleep 1 after it. - - mapfile -t lines <~/.iankdirs + mapfile -t lines <~/.cdirs start=$(( ${#lines[@]} - 1 )) # we have ~33 buttons as of this writing, so lets # prune down the history every once in a while. if (( start > 500 )); then - tmpfile=$(mktemp) - tac ~/.iankdirs | awk '!seen[$0]++' | head -n 200 >$tmpfile - cat $tmpfile > ~/.iankdirs + tac ~/.cdirs | awk '!seen[$0]++' | head -n 200 | tac | sponge ~/.cdirs || [[ $? == 141 ]] fi - for (( j=$start; j >= 0; j-- )); do + for (( j=start; j >= 0; j-- )); do line="${lines[$j]}" if [[ ! $line || ${alines[$line]} || ! -d "$line" || $line == "$PWD" || line == "$HOME" ]]; then continue @@ -572,34 +558,38 @@ 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 )) done if (( i == 0 )); then - echo "no dirs in ~/.iankdirs" + echo "no dirs in ~/.cdirs" return 0 fi read -r -N 1 input if [[ $input != $'\n' ]]; then - c ${buttondirs[$input]} + c "${buttondirs[$input]}" fi } +# 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 - start=$(( ${#_iankdirb[@]} - 1 )) + start=$(( ${#_dir_back[@]} - 1 )) # cleanup possible repeating of pwd - if (( start >= 0 )) && [[ ${_iankdirb[$start]} == "$PWD" ]]; then + if (( start >= 0 )) && [[ ${_dir_back[$start]} == "$PWD" ]]; then start=$(( start - 1 )) fi j=1 if (( start >= 0 )); then - for (( i=$start; i >= 0 ; i-- )); do - printf "%s %s\n" $j ${_iankdirb[i]} + for (( i=start; i >= 0 ; i-- )); do + printf "%s %s\n" $j ${_dir_back[i]} j=$(( j + 1 )) if (( j >= max )); then break @@ -608,11 +598,10 @@ bl() { fi max=10 - - start=$(( ${#_iankdirf[@]} - 1 )) + start=$(( ${#_dir_forward[@]} - 1 )) # cleanup possible repeating of pwd - if (( start >= 0 )) && [[ ${_iankdirf[$start]} == "$PWD" ]]; then + if (( start >= 0 )) && [[ ${_dir_forward[$start]} == "$PWD" ]]; then start=$(( start - 1 )) fi if (( start < 0 )); then @@ -620,14 +609,362 @@ bl() { fi echo -- j=1 - for (( i=$start; i >= 0 ; i-- )); do - printf "%s %s\n" $j ${_iankdirf[i]} + for (( i=start; i >= 0 ; i-- )); do + printf "%s %s\n" $j ${_dir_forward[i]} j=$(( j + 1 )) if (( j >= max )); then break 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. +# +# Usage: pd [-t TAG] COMMAND... +# +# -t TAG Override the tag in the syslog. The default is COMMAND with +# any path part is removed, eg. for /bin/cat the tag is cat. +# +# You can view the log via "journalctl -t TAG" +pd() { + local tag ret + ret=0 + tag=${1##*/} + case $1 in + -t) tag="$2"; shift 2 ;; + esac + echo "PWD=$PWD command: $*" | logger -t $tag + "$@" |& pee cat "logger -t $tag" || ret=$? + echo "exited with status=$ret" | pee cat "logger -t $tag" + # this avoids any err-catch + (( ret == 0 )) || return $ret +} +ccomp time pd + +# jdo = journal do. Run command as transient systemd service, tailing +# its output in the journal until it completes. +# +# Usage: jdo COMMAND... +# +# Compared to pd: commands recognize this is a non-interactive shell. +# The service is unaffected if our ssh connection dies, no need to run +# in screen or tmux. +# +# Note: The last few lines of any existing entries for a unit by that +# name will be output first, and there will be a few second delay at the +# start of the command, and a second or so at the end. +# +# Note: Functions and aliases obviously won't work, we resolve the +# command to a file. +# +# Note: requires running as root. +jdo() { + local cmd cmd_name jr_pid ret + ret=0 + cmd="$1" + shift + if [[ $EUID != 0 ]]; then + echo "jdo: error: rerun as root" + return 1 + fi + cmd_name=${cmd##*/} + if [[ $cmd != /* ]]; then + cmd=$(type -P "$cmd") + fi + # -q = quiet + journalctl -qn2 -f -u "$cmd_name" & + # Trial and error of time needed to avoid missing initial lines. + # .5 was not reliable. 1 was not reliable. 2 was not reliable + sleep 4 + jr_pid=$! + systemd-run --unit "$cmd_name" --wait --collect "$cmd" "$@" || ret=$? + # The sleep lets the journal output its last line + # before the prompt comes up. + sleep .5 + kill $jr_pid &>/dev/null ||: + unset jr_pid + fg &>/dev/null ||: + # this avoids any err-catch + (( ret == 0 )) || return $ret +} +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 <$path <<'EOF'" + cat "$f" + echo EOF + done +} + + +# file cut copy and paste, like the text buffers :) +# I havnt tested these. +_fbufferinit() { # internal use + ! [[ $my_f_tempdir ]] && my_f_tempdir="$(mktemp -d)" + rm -rf "${my_f_tempdir:?}"/* +} +fcp() { # file cp + _fbufferinit + cp "$@" "$my_f_tempdir"/ +} +fct() { # file cut + _fbufferinit + mv "$@" "$my_f_tempdir"/ +} +fpst() { # file paste + [[ $2 ]] && { echo too many arguments; return 1; } + target=${1:-.} + cp "$my_f_tempdir"/* "$target" +} + +_khfix-common() { + local host ip port file key tmp + read -r host ip port < <(timeout -s 9 2 ssh -oBatchMode=yes -oControlMaster=no -oControlPath=/ -v $1 |& sed -rn "s/debug1: Connecting to ([^ ]+) \[([^\]*)] port ([0-9]+).*/\1 \2 \3/p" ||: ) + file=$(readlink -f ~/.ssh/known_hosts) + if [[ ! $ip ]]; then + echo "khfix: ssh failed" + return 1 + fi + if [[ $port != 22 ]]; then + ip_entry="[$ip]:$port" + host_entry="[$host]:$port" + else + ip_entry=$ip + host_entry=$host + fi + if [[ $host != "$ip" ]]; then + tmp=$(mktemp) + ssh-keygen -F "$host_entry" -f $file >$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 + 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 +} +khfix-r() { # known hosts fix without syncing to root user + _khfix-common "$@" || return 1 + ssh $1 : +} +khfix() { + _khfix-common "$@" || return 1 + ssh $1 : + rootsshsync +} + +# copy path into clipboard +a() { + local x + x=$(readlink -nf "${1:-$PWD}") + # yes, its kinda dumb that xclip/xsel cant do this in one invocation. + # And, summarizing this: + # https://askubuntu.com/questions/705620/xclip-vs-xsel + # xclip has a few more options. xclip has a bug in tmux / forwarded x sessions. + cbs "$x" +} + +# clipboard a string (into selection & clipboard buffer) +cbs() { + # yes, its kinda dumb that xclip/xsel cant do this in one invocation. + # And, summarizing this: + # https://askubuntu.com/questions/705620/xclip-vs-xsel + # xclip has a few more options. xclip has a bug in tmux / forwarded x sessions. + printf "%s" "$*" | xclip -selection clipboard + printf "%s" "$*" | xclip +} + +# a1 = awk {print $1} +for field in {1..20}; do + eval a$field"() { awk '{print \$$field}'; }" +done +# h1 = head -n1 +for num in {1..9}; do + eval h$num"() { head -n$num || [[ \$? == 141 ]]; }" +done + + +hexipv4() { + # shellcheck disable=SC2046 disable=SC2001 disable=SC2183 # hacks, expected + printf '%d.%d.%d.%d\n' $(echo $1 | sed 's/../0x& /g') +} + +vp9() { + local f out outdir in fname origdir skip1 + origdir="$PWD" + outdir=vp9 + skip1=false + while [[ $1 == -* ]]; do + case $1 in + # if we got interrupted after 1st phase + -2) + skip1=true + shift + ;; + --out) + outdir=$2 + shift 2 + ;; + esac + done + m mkdir -p $outdir + # first pass only uses about 1 cpu, so run in parallel + for f; do + { + fname="${f##*/f}" + if [[ $f == /* ]]; then + in="$f" + else + in=$origdir/$f + fi + out="$origdir/$outdir/$fname" + mkdir -p /tmp/vp9/$fname + cd /tmp/vp9/$fname + if ! $skip1 && [[ ! -s ffmpeg2pass-0.log ]]; then + # -nostdin or else wait causes ffmpeg to go into stopped state. dunno why, random stackoverflow answer. + m ffmpeg -nostdin -hide_banner -loglevel error -i $in -g 192 -vcodec libvpx-vp9 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 1 -an -f null /dev/null + fi + if [[ -e $out ]]; then rm -f $out; fi + m ffmpeg -nostdin -hide_banner -loglevel error -y -i $in -g 192 -vcodec libvpx-vp9 -tile-rows 2 -vf scale=-1:720 -max_muxing_queue_size 9999 -b:v 750K -pass 2 -c:a libvorbis -qscale:a 5 $out + } & + done + wait -f + cd "$origdir" +} + +utcl() { # utc 24 hour time to local hour 24 hour time + echo "print( ($1 $(date +%z | sed -r 's/..$//;s/^(-?)0*/\1/')) % 24)"|python3 +} + +bwm() { + s bwm-ng -T avg -d +} + + +# for running in a fai rescue. iank specific. +kdrescue() { + d=vgata-Samsung_SSD_850_EVO_2TB_S2RLNX0J502123D + for f in $d vgata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V; do + cryptsetup luksOpen --key-file /p /dev/$f/root crypt-$f-root + cryptsetup luksOpen --key-file /p /dev/$f/o crypt-$f-o + done + mount -o subvol=root_trisquelaramo /dev/mapper/crypt-$d-root /mnt + mount -o subvol=a /dev/mapper/crypt-$d-root /mnt/a + mount -o subvol=o /dev/mapper/crypt-$d-o /mnt/o + mount -o subvol=boot_trisquelaramo /dev/sda2 /mnt/boot + cd /mnt + chrbind +} + @@ -644,12 +981,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 @@ -661,6 +1003,10 @@ clc() { echo "scale=3; $x" | bc -l } +cx() { + chmod +X "$@" +} + cam() { git commit -am "$*" } @@ -683,7 +1029,7 @@ chrbind() { chumount() { local d # dev/pts needed for pacman signature check - for d in dev proc sys dev/pts; do + for d in dev/pts dev proc sys; do [[ -d $d ]] if mountpoint $d &>/dev/null; then m s umount $d @@ -746,6 +1092,10 @@ cat-new-files() { } +chownme() { + s chown -R $USER:$USER "$@" +} + # shellcheck disable=SC2032 chown() { # makes it so chown -R symlink affects the symlink and its target. @@ -766,6 +1116,12 @@ cim() { d() { builtin bg "$@"; } ccomp bg d +# f would be more natural, but i already am using it for something +z() { builtin fg "$@"; } +ccomp fg z + +x() { builtin kill %%; } + dc() { diff --strip-trailing-cr -w "$@" # diff content } @@ -779,6 +1135,39 @@ despace() { done } +# df progress +# usage: dfp MOUNTPOINT [SECOND_INTERVAL] +# SECOND_INTERVAL defaults to 90 +dfp() { + # mp = mountpoint + local a b mp interval + mp=$1 + interval=${2:-90} + if [[ ! $mp ]]; then + echo "dfp: error, missing 1st arg" >&2 + return 1 + fi + while true; do + a=$(df --output=used $mp | tail -n1) + sleep $interval + b=$(df --output=used $mp | tail -n1) + printf "used mib: %'d mib/min: %s\n" $(( b /1000 )) $(( (b-a) / (interval * 1000 / 60 ) )) + done +} + +# get ipv4 ip from HOST. or if it is already a number, return that +hostip() { + local host="$1" + case $host in + [0-9:]) + echo "$host" + ;; + *) + getent ahostsv4 "$host" | awk '{ print $1 }' | head -n1 + ;; + esac +} + dig() { command dig +nostats +nocmd "$@" } @@ -813,10 +1202,18 @@ digdiff() { diff -u /tmp/digdiff <(digsort $s2 "$@") } +# date in a format i like reading dt() { date "+%A, %B %d, %r" "$@" } -ccomp date dt +dtr() { + date -R "$@" +} +# date with all digits in a format i like +dtd() { + date +%F_%T% "$@" +} +ccomp date dt dtr dtd dus() { # du, sorted, default arg of du -sh ${@:-*} | sort -h @@ -824,7 +1221,7 @@ dus() { # du, sorted, default arg of ccomp du dus -e() { echo "$@"; } +e() { printf "%s\n" "$*"; } # echo args ea() { @@ -836,7 +1233,8 @@ ea() { printf "%s" "${arg}" |& hexdump -C done } -# echo vars. print var including escapes, etc + +# echo variables. print var including escapes, etc, like xxd for variable ev() { if (( ! $# )); then echo no args @@ -857,10 +1255,29 @@ ediff() { } # mail related +# shellcheck disable=SC2120 # we expect to pass arguments in use outside this file etail() { + ngset + tail -F /var/log/exim4/mainlog /var/log/exim4/*main /var/log/exim4/paniclog /var/log/exim4/*panic -n 200 "$@" + ngreset +} +etailm() { tail -F /var/log/exim4/mainlog -n 200 "$@" } -ccomp tail etail +etail2() { + tail -F /var/log/exim4/mymain -n 200 "$@" +} +ccomp tail etail etail2 + +# ran into this online, trying it out +detach() { + ( "$@" &>/dev/null & disown ) +} + +showkeys() { + ssh "$@" cat .ssh/authorized_keys{,2} +} + # print exim old pids eoldpids() { @@ -872,7 +1289,7 @@ eoldpids() { fi for pid in $(pgrep -f '^/usr/sbin/exim4( |$)'); do # the daemonpid gets reexeced on HUP (service reloads), keeping its same old timestamp - if [[ $pid == $daemonpid ]]; then + if [[ $pid == "$daemonpid" ]]; then continue fi piduptime=$(awk -v ticks="$(getconf CLK_TCK)" 'NR==1 { now=$1; next } END { printf "%9.0f\n", now - ($20/ticks) }' /proc/uptime RS=')' /proc/$pid/stat) ||: # sometimes pids disappear pretty fast @@ -896,12 +1313,13 @@ etailnew() { } # exim watch as old pids go away ewatchold() { - local configtime pid piduptime now + local configtime pid piduptime now tmpstr local -i count local -a oldpids count=0 while true; do - oldpids=($(eoldpids)) + tmpstr=$(eoldpids) + mapfile -t oldpids <<<"$tmpstr" if (( ! ${#oldpids[@]} )); then return fi @@ -920,14 +1338,18 @@ eless() { } ccomp less eless eqcat() { - exiqgrep -i -o 60 | while read -r i; do + exiqgrep -ir.\* -o 60 | while read -r i; do hlm exim -Mvc $i echo hlm exigrep $i /var/log/exim4/mainlog | cat ||: done } eqrmf() { - exiqgrep -i | xargs exim -Mrm + # other ways to get the list of message ids: + # exim -bp | awk 'NF == 4 {print $3}' + # # this is slower 160ms, vs 60. + # exipick -i + exiqgrep -ir.\* | xargs exim -Mrm } econfdevnew() { @@ -942,6 +1364,20 @@ econfdev() { update-exim4.conf -d /tmp/edev/etc/exim4 -o /tmp/edev/e.conf } +# exim grep in +# show important information about incoming mail in the exim log +egrin() { + sed -rn '/testignore|jtuttle|eximbackup/!s/^[^ ]+ ([^ ]+) [^ ]+ [^ ]+ <= ([^ ]+).*T="(.*)" from (<[^ ]+> .*$)/\1 \4\n \3/p' <${1:-/var/log/exim4/mainlog} +} + +# 2nd line is message-id: +egrinid() { + sed -rn '/testignore|jtuttle|eximbackup/!s/^[^ ]+ ([^ ]+) [^ ]+ [^ ]+ <= ([^ ]+).* id=([^ ]+) T="(.*)" from (<[^ ]+> .*$)/\1 \5\n \3\n \4/p' <${1:-/var/log/exim4/mainlog} +} +etailin() { + tail -F /var/log/exim4/mainlog | sed -rn '/testignore|jtuttle|eximbackup/!s/^[^ ]+ ([^ ]+) [^ ]+ [^ ]+ <= ([^ ]+).*T="(.*)" from (<[^ ]+> .*$)/\1 \4\n \3/p' +} + @@ -954,12 +1390,84 @@ fa() { done < <(find "$@" -print0); } +# shellcheck disable=SC2120 faf() { # find all files. use -L to follow symlinks find "$@" -not \( -name .svn -prune -o -name .git -prune \ -o -name .hg -prune -o -name .editor-backups -prune \ -o -name .undo-tree-history -prune \) -type f 2>/dev/null } +# usage ffconcat FILES_TO_CONCAT OUTPUT_FILE +ffconcat() { + local tmpf + tmpf=$(mktemp) + printf "file '%s'\n" "$1" >$tmpf + while (( $# > 1 )); do + shift + printf "file '%s'\n" "$1" >>$tmpf + done + # https://trac.ffmpeg.org/wiki/Concatenate + ffmpeg -f concat -safe 0 -i $tmpf -c copy "$1" + rm $tmpf +} +ffremux() { + local tmpf tmpd + if (( $# == 0 )); then + echo ffremux error expected args >&2 + return 1 + fi + tmpd="$(mktemp -d)" + for f; do + tmpf=$tmpd/"${f##*/}" + ffmpeg -i "$f" -c:v copy -c:a copy $tmpf + cat $tmpf >"$f" + done + rm -r $tmpd +} + + + +# absolute path of file/dir without resolving symlinks. +# +# Most of the time, I want this where I would normally use readlink. +# This is what realpath -s does in most cases, but sometimes it +# actually resolves symlinks, at least when they are in /. +# +# Note, if run on a dir, if the final component is relative, it won't +# resolve that. Use the below fpd for that. +# +# note: we could make a variation of this which +# assigns to a variable name using eval, so that we don't have to do +# x=$(fp somepath), which might save subshell overhead and look nice, +# but I'm not going to bother. +fp() { + local initial_oldpwd initial_pwd dir base + initial_oldpwd="$OLDPWD" + initial_pwd="$PWD" + if [[ $1 == */* ]]; then + dir="${1%/*}" + base="/${1##*/}" + # CDPATH because having it set will cause cd to possibly print output + CDPATH='' cd "$dir" + printf "%s%s\n" "$PWD" "$base" + CDPATH='' cd "$initial_pwd" + OLDPWD="$initial_oldpwd" + else + printf "%s/%s\n" "$PWD" "$1" + fi +} +# full path of directory without resolving symlinks +fpd() { + local initial_oldpwd initial_pwd dir + initial_oldpwd="$OLDPWD" + initial_pwd="$PWD" + dir="$1" + CDPATH='' cd "$dir" + printf "%s%s\n" "$PWD" "$base" + cd "$initial_pwd" + OLDPWD="$initial_oldpwd" +} + # mail related frozen() { @@ -977,7 +1485,7 @@ frozenrm() { local ids=() while read -r line; do printf '%s\n' "$line" - ids+=($(printf '%s\n' "$line" |gr frozen|awk '{print $3}')) + ids+=("$(printf '%s\n' "$line" |gr frozen|awk '{print $3}')") done < <(s mailq) echo "sleeping for 2 in case you change your mind" sleep 2 @@ -1048,9 +1556,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 @@ -1073,8 +1578,13 @@ 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 PATH="$EMACSDIR/lib-src:$EMACSDIR/src:$PATH" EHOME=$HOME HOME=$EMACSDIR m emacsclient -a "" $args "$@" else if $gdb; then @@ -1083,8 +1593,8 @@ g() { # m gdb -ex="set follow-fork-mode child" -ex=r -ex=quit --args emacs --daemon m emacsclient -a "" $args "$@" sleep 1 - cd /a/opt/emacs-$(distro-name)$(distro-num) - s gdb -p $(pgrep -f 'emacs --daemon') -ex c + cd "/a/opt/emacs-$(distro-name)$(distro-num)" + s gdb -p "$(pgrep -f 'emacs --daemon')" -ex c cd - else m emacsclient -a "" $args "$@" @@ -1092,6 +1602,28 @@ 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() { + # shellcheck disable=SC2046 # i want word splitting for this hackery + g $("$@") +} + # force terminal version gn() { g -n "$@" @@ -1124,9 +1656,22 @@ ccomp grep gr grr rg() { grr "$@"; } ccomp grep rg -hr() { # horizontal row. used to break up output - printf "$(tput setaf 5 2>/dev/null ||:)█$(tput sgr0 2>/dev/null||:)%.0s" $(eval echo "{1..${COLUMNS:-60}}") - echo +# recursive everything. search for files/dirs and lines. rs = easy chars to press +re() { + local query + query="$1" + find "$@" -not \( -name .svn -prune -o -name .git -prune \ + -o -name .hg -prune -o -name .editor-backups -prune \ + -o -name .undo-tree-history -prune \) 2>/dev/null | grep -iP --color=auto "$query" + grr -m 5 "$@" +} + +# horizontal row. used to break up output +hr() { + local blocks + # 180 is long enough. + blocks=██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████ + printf "%s\n" "$(tput setaf 5 2>/dev/null ||:)${blocks:0:${COLUMNS:-180}}$(tput sgr0 2>/dev/null||:)" } # highlight hl() { @@ -1137,6 +1682,7 @@ hl() { col=$((60 - input_len)) printf "\e[1;97;41m%s" "$*" if (( col > 0 )); then + # shellcheck disable=SC2046 # needed to work as intended. a better way would be like hr above. printf "\e[1;97;41m \e[0m%.0s" $(eval echo "{1..${col}}") fi echo @@ -1145,7 +1691,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 @@ -1157,9 +1782,13 @@ hrcat() { local f; for f; do [[ -f $f ]] || continue; hr; echo "$f"; cat "$f"; d # On first use, you input username/pass and it gets an oath token so you dont have to repeat # it\'s at ~/.config/hub hub() { - local up uptar updir p - p=/github/hub/releases/ - up=https://github.com/$(curl -s https://github.com$p| grep -o $p'download/[^/]*/hub-linux-amd64[^"]*' | head -n1) + local up uptar updir p re + # example https://github.com/github/hub/releases/download/v2.14.2/hub-linux-amd64-2.14.2.tgz + up=$(wget -q -O- https://api.github.com/repos/github/hub/releases/latest | jq -r .assets[].browser_download_url | grep linux-amd64) + re='[[:space:]]' + if [[ ! $up || $up =~ $re ]]; then + echo "failed to get good update url. got: $up" + fi uptar=${up##*/} updir=${uptar%.tgz} if [[ ! -e /a/opt/$updir ]]; then @@ -1187,6 +1816,21 @@ hub() { i() { git "$@"; } ccomp git i +# git status: +# cvs -qn update + +# git checkout FILE +# cvs update -C FILE + +# git pull +# cvs up[date] + +# potentially useful command translation +# https://fling.seas.upenn.edu/~giesen/dynamic/wordpress/equivalent-commands-for-git-svn-and-cvs/ + +# importing cvs repo into git using git-cvs package: +# /f/www $ /usr/lib/git-core/git-cvsimport -C /f/www-git + ic() { # fast commit all git commit -am "$*" @@ -1197,9 +1841,18 @@ ipp() { git push } - ifn() { - # insensitive find + local glob + glob="$1" + shift + find -L "$@" -not \( -name .svn -prune -o -name .git -prune \ + -o -name .hg -prune -o -name .editor-backups -prune \ + -o -name .undo-tree-history -prune \) -iname "*$glob*" 2>/dev/null +} + +ifh() { + # insensitive find here. args are combined into the search string. + # -L = follow symlinks find -L . -not \( -name .svn -prune -o -name .git -prune \ -o -name .hg -prune -o -name .editor-backups -prune \ -o -name .undo-tree-history -prune \) -iname "*$**" 2>/dev/null @@ -1222,14 +1875,22 @@ istext() { grep -Il "" "$@" &>/dev/null } -jtail() { - journalctl -n 10000 -f "$@" +pst() { + pstree -apnA } -jr() { journalctl "$@" ; } -jrf() { journalctl -f "$@" ; } + +# journalctl with times in the format the --since= and --until= options accept +jrt() { journalctl -e -n100000 -o short-full "$@"; } +jr() { journalctl -e -n100000 "$@" ; } +jrf() { journalctl -n1000 -f "$@" ; } jru() { - journalctl -u exim4 _SYSTEMD_INVOCATION_ID=$(systemctl show -p InvocationID --value $1) + # the invocation id is "assigned each time the unit changes from an inactive + # state into an activating or active state" man systemd.exec + journalctl -e --no-tail -u exim4 _SYSTEMD_INVOCATION_ID="$(systemctl show -p InvocationID --value $1)" } +ccomp journalctl jr jrf jru + + l() { if [[ $PWD == /[iap] ]]; then @@ -1290,6 +1951,7 @@ low() { # make filenames lowercase, remove bad chars fi f="${arg##*/}" new="${f,,}" # downcase + # shellcheck disable=SC2031 # seems like a shellcheck bug new="${new//[^a-zA-Z0-9._-]/_}" # sub bad chars new="${new#"${new%%[[:alnum:]]*}"}" # remove leading/trailing non-alnum new="${new%"${new##*[[:alnum:]]}"}" @@ -1327,14 +1989,19 @@ ksu() { # history search unique # inexplicably truncated in the past. histrm() { history -n - HISTTIMEFORMAT= history | awk -v IGNORECASE=1 '{ a=$1; sub(/^ *[^ ]+ */, "") }; /'"$*"'/' - read -p "press anything but contrl-c to delete" - for entry in $(HISTTIMEFORMAT= history | awk -v IGNORECASE=1 '{ a=$1; sub(/^ *[^ ]+ */, "") }; /'"$*"'/ { print a }' | tac); do + HISTTIMEFORMAT='' history | awk -v IGNORECASE=1 '{ a=$1; sub(/^ *[^ ]+ */, "") }; /'"$*"'/' + read -r -p "press anything but contrl-c to delete" + for entry in $(HISTTIMEFORMAT='' history | awk -v IGNORECASE=1 '{ a=$1; sub(/^ *[^ ]+ */, "") }; /'"$*"'/ { print a }' | tac); do history -d $entry done history -w } +# history without the date +histplain() { + history "$@" | cut -d' ' -f 7- +} + ccomp grep k ks ksu histrm @@ -1350,7 +2017,16 @@ mkc() { ccomp mkdir mkc mkct() { - mkc $(mktemp -d) + mkc "$(mktemp -d)" +} +# mkdir the last arg, cp the rest into it +mkcp() { + mkdir -p "${@: -1}" + cp "${@:1:$#-1}" "${@: -1}" +} +mkmv() { + mkdir -p "${@: -1}" + mv "${@:1:$#-1}" "${@: -1}" } mkt() { # mkdir and touch file @@ -1364,55 +2040,107 @@ mkdir() { command mkdir -p "$@"; } nags() { # https://github.com/HenriWahl/Nagstamon/issues/357 - if ! pgrep -f /usr/lib/notification-daemon/notification-daemon >/dev/null; then - /usr/lib/notification-daemon/notification-daemon & + if ! pgrep -f /usr/bin/dunst >/dev/null; then + /usr/bin/dunst & fi /usr/bin/nagstamon & } +# profanity screen +profsrc() { + screen -RD -S profanity +} + +# i dont want to wait for konsole to exit... +prof() { + command prof &>/dev/null & +} +# self chat +sc() { + while read -r l; do + printf '\033[1A\033[K'; printf "%s\n" "$l"| ts "%F %T" | tee -a /p/self-chat.log + done +} + nmt() { - s nmtui-connect "$@" + # cant use s because sudo -i doesnt work for passwordless sudo command + case $EUID in + 0) + sudo nmtui-connect "$@" + ;; + *) + nmtui-connect "$@" + ;; + esac +} + + +ngset() { + if shopt nullglob >/dev/null; then + ngreset=false + else + shopt -s nullglob + ngreset=true + fi +} +ngreset() { + if $ngreset; then + shopt -u nullglob + fi } nopanic() { # shellcheck disable=SC2024 - sudo tee -a /var/log/exim4/paniclog-archive /dev/null) ||: + cached=$(ls -t /var/cache/apt/archives/${pkg}_* 2>/dev/null | tail -n1 2>/dev/null) ||: if [[ $cached ]]; then - cp $cached . + m cp $cached . else - aptitude download $pkg || return 1 + m aptitude download $pkg || return 1 fi tmp=(*); f=${tmp[0]} # only 1 expected - ex $f - rm -f $f + m ex $f + m rm -f $f } # pgrep and kill pk1() { - local pid - pid=($(pgrep -f "$*")) - case ${#pid[@]} in + local tmpf + local -a pids + tmpf=$(pgrep -f "$*") + mapfile -t pids <<<"$tmpf" + case ${#pids[@]} in 1) # shellcheck disable=SC2128 { - ps -F $pid - m kill $pid + ps -F ${pids[0]} + m kill ${pids[0]} } ;; 0) echo "no pid found" ;; *) - ps -F ${pid[@]} + ps -F ${pids[@]} ;; esac } @@ -1456,8 +2184,9 @@ r() { # scp is insecure and deprecated. scp() { - rsync --inplace "$@" + rsync -Pt --inplace "$@" } +ccomp rsync scp randport() { # available high ports are 1024-65535, @@ -1470,6 +2199,7 @@ EOF # reapply bashrc reb() { + # shellcheck disable=SC1090 # expected to not follow source ~/.bashrc } @@ -1494,8 +2224,9 @@ rst() { # rl without preserving modification time. rsync -ahvic --delete --no-t "$@" } -rsu() { # [OPTS] HOST PATH - # eg. rlu -opts frodo /testpath +# [RSYNC_OPTS] HOST PATH +rsu() { + # eg. rsu -opts frodo /testpath # relative paths will expanded with readlink -f. opts=("${@:1:$#-2}") # 1 to last -2 path="${*:$#}" # last @@ -1503,10 +2234,7 @@ rsu() { # [OPTS] HOST PATH if [[ $path == .* ]]; then path=$(readlink -f $path) fi - # rync here uses checksum instead of time so we dont mess with - # unison relying on time as much. g is for group, same reason - # to keep up with unison. - m s rsync -rlpchviog --relative "${opts[@]}" "$path" "root@$host:/"; + m rsync -ahvi --relative --no-implied-dirs "${opts[@]}" "$path" "root@$host:/"; } ccomp rsync rsd rsa rst rsu @@ -1539,7 +2267,7 @@ resolvcat() { grep '^ *hosts:' /etc/nsswitch.conf if systemctl is-enabled systemd-resolved &>/dev/null || [[ $(systemctl is-active systemd-resolved ||:) != inactive ]]; then hr; m ser status systemd-resolved | cat || : - hr; m systemd-resolve --status | cat + hr; m resolvectl status | cat fi } @@ -1564,10 +2292,32 @@ reresolv() { fi } +# add annoyingly long argument which should be the default +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 } +urun () { + umask $1 + shift + "$@" +} sudo () { command sudo "$@" || return $? DID_SUDO=true @@ -1596,12 +2346,14 @@ sb() { # sudo bash -c local SUDOD="$PWD" sudo -i bash -c "$@" } -ccomp sudo s sb +# secret sudo +se() { s urun 0077 "$@"; } +ccomp sudo s sb se safe_rename() { # warn and dont rename if file exists. # mv -n exists, but it\'s silent if [[ $# != 2 ]]; then - echo safe_rename error: $# args, need 2 >2 + echo safe_rename error: $# args, need 2 >&2 return 1 fi if [[ $1 != "$2" ]]; then # yes, we want to silently ignore this @@ -1647,7 +2399,7 @@ setini() { # set a value in a .ini style file if [[ -s $file ]]; then sed -ri -f - "$file" </dev/null) == '#!/bin/bash'* ]] +} sk() { + # see https://savannah.gnu.org/maintenance/fsf/bash-style-guide/ for justifications + local quotes others ret + quotes=2048,2068,2086,2206,2254 + others=2029,2032,2033,2054,2164 + shellcheck -x -W 999 -e $quotes,$others "$@" || ret=$? + if (( ret >= 1 )); then + echo "A template comment to disable is now in clipboard. eg: # shellcheck disable=SC2206 # reason" + cbs "# shellcheck disable=SC" + return $ret + fi +} +# sk with quotes. For checking scripts that we expect to take untrusted +# input in order to verify we quoted vars. +skq() { + local others + others=2029,2033,2054,2164 + shellcheck -W 999 -x -e $others "$@" || return $? +} - # disable a warning with: - # shellcheck disable=SC2206 # reasoning +# sk on all modified files in current git repo +skmodified() { + local f + for f in $(i s | awk '$1 == "modified:" {print $2}'); do + if sk-p "$f"; then + sk $f ||: + fi + done +} - # see bash-template/style-guide.md for justifications - local quotes others - quotes=2048,2068,2086,2206 - others=2029,2033,2164 - shellcheck -W 999 -x -e $quotes,$others "$@" || return $? +# sk on all the files in current git repo +skgit() { + local f toplevel orig_dir tmp + local -a ls_files sk_files + toplevel=$(git rev-parse --show-toplevel) + if [[ $PWD != "$toplevel" ]]; then + orig_dir=$PWD + cd $toplevel + fi + # tracked & untracked files + tmp=$(git ls-files && git ls-files --others --exclude-standard) + mapfile -t ls_files <<<"$tmp" + for f in "${ls_files[@]}"; do + if sk-p "$f"; then + sk_files+=("$f") + fi + done + sk "${sk_files[@]}" + if [[ $orig_dir ]]; then + cd $orig_dir + fi } @@ -1784,9 +2581,11 @@ sl() { force_rsync=true shift fi - + # shellcheck disable=SC2153 # intentional sl_test_cmd=$SL_TEST_CMD + # shellcheck disable=SC2153 # intentional sl_test_hook=$SL_TEST_HOOK + # shellcheck disable=SC2153 # intentional sl_rsync_args=$SL_RSYNC_ARGS while [[ $1 ]]; do case "$1" in @@ -1839,7 +2638,7 @@ sl() { shift if [[ ! $SL_INFO_DIR ]]; then - echo error: missing '$SL_INFO_DIR' env var >&2 + echo 'error: missing SL_INFO_DIR env var' >&2 return 1 fi @@ -1881,7 +2680,7 @@ sl() { if $haveinfo && [[ $type == b ]]; then info_sec=${tmp::10} - read files_sec _ < <(find -L $SL_FILES_DIR -printf "%T@ %p\n" | sort -nr || [[ $? == 141 || ${PIPESTATUS[0]} == 32 ]] ) + read -r files_sec _ < <(find -L $SL_FILES_DIR -printf "%T@ %p\n" | sort -nr || [[ $? == 141 || ${PIPESTATUS[0]} == 32 ]] ) files_sec=${files_sec%%.*} if (( files_sec > info_sec )); then dorsync=true @@ -1892,7 +2691,7 @@ sl() { sync_dirname=${SL_FILES_DIR##*/} if [[ ! $SL_FILES_DIR ]]; then - echo error: missing '$SL_FILES_DIR' env var >&2 + echo 'error: missing SL_FILES_DIR env var' >&2 return 1 fi @@ -1943,11 +2742,7 @@ ssk() { ccomp ssh sl slr sss ssk # plain ssh ssh() { - if [[ $TERM == alacritty || $TERM == xterm-kitty ]]; then - TERM=xterm-256color LC_USEBASHRC=t command ssh "$@" - else - LC_USEBASHRC=t command ssh "$@" - fi + LC_USEBASHRC=t command ssh "$@" } @@ -1962,8 +2757,12 @@ slog() { while getopts "lt" option do case $option in - l ) arg_base=$logdir ;; - t ) do_stamp=true ;; + l) arg_base=$logdir ;; + t) do_stamp=true ;; + *) + echo error: bad option + return 1 + ;; esac done shift $((OPTIND - 1)) @@ -1994,7 +2793,7 @@ srm () { srun() { scp $2 $1:/tmp - ssh $1 /tmp/${2##*/} $(printf "%q\n" "${@:2}") + ssh $1 "/tmp/${2##*/}" "$(printf "%q\n" "${@:2}")" } @@ -2056,15 +2855,23 @@ psoff() { # however, DEBUG is not inherited, so we need to run it outside a function. # And we want to run set -x afterwards to avoid spam, so we cram everything # in here, and then it will run after this function is done. - PROMPT_COMMAND='trap DEBUG; unset PROMPT_COMMAND; PS1="\w \$ "' + # # set as array to satisfy shellcheck, but it is equivalent to setting it as non-array + PROMPT_COMMAND=('trap DEBUG; unset PROMPT_COMMAND; PS1="\w \$ "') } pson() { - PROMPT_COMMAND=prompt-command + PROMPT_COMMAND=(prompt-command) if [[ $TERM == *(screen*|xterm*|rxvt*) ]]; then - trap 'settitle "$BASH_COMMAND"' DEBUG + trap 'auto-window-title "$BASH_COMMAND"' DEBUG fi } +# prometheus node curl +pnodecurl() { + local host + host=${1:-127.0.0.1} + s curl --cert-type PEM --cert /etc/prometheus/ssl/prometheus_cert.pem --key /etc/prometheus/ssl/prometheus_key.pem --cacert /etc/prometheus/ssl/prom_node_cert.pem --resolve prom_node:9100:$host -v https://prom_node:9100/metrics +} + tx() { # toggle set -x, and the prompt so it doesnt spam if [[ $- == *x* ]]; then set +x @@ -2094,6 +2901,36 @@ nonet() { } m() { printf "%s\n" "$*"; "$@"; } +m2() { printf "%s\n" "$*" >&2; "$@"; } + +# update file. note: duplicated in mail-setup. +# updates $ur u result to true or false +# updates $reload to true if file updated is in /etc/systemd/system +u() { + local tmp tmpdir dest="$1" + local base="${dest##*/}" + local dir="${dest%/*}" + if [[ $dir != "$base" ]]; then + # dest has a directory component + mkdir -p "$dir" + fi + # shellcheck disable=SC2034 # see comment at top of function + ur=false # u result + tmpdir="$(mktemp -d)" + cat >$tmpdir/"$base" + tmp=$(rsync -ic $tmpdir/"$base" "$dest") + if [[ $tmp ]]; then + printf "%s\n" "$tmp" + # shellcheck disable=SC2034 # see comment at top of function + ur=true + if [[ $dest == /etc/systemd/system/* ]]; then + # shellcheck disable=SC2034 # see comment at top of function + reload=true + fi + fi + rm -rf $tmpdir +} + uptime() { if type -p uprecords &>/dev/null; then @@ -2129,23 +2966,237 @@ 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, +# and changing directory, so we don't have any open +# directories or files that could cause problems when +# remounting. +zr() { + local tmp + tmp=$(type -p "$1") + if [[ $tmp ]]; then + cd "$(mktemp -d)" + cp -a "$tmp" . + shift + ./"${tmp##*/}" "$@" + else + "$@" + fi +} + + +# * spark +# spark 1 5 22 13 53 +# # => ▁▁▃▂▇ + +# The MIT License +# Copyright (c) Zach Holman, https://zachholman.com +# https://github.com/holman/spark + +# As of 2022-10-28, I reviewed github forks that had several newer +# commits, none had anything interesting. I did a little refactoring +# mostly to fix emacs indent bug. + +# Generates sparklines. +_spark_echo() +{ + if [ "X$1" = "X-n" ]; then + shift + printf "%s" "$*" + else + printf "%s\n" "$*" + fi +} + + +spark() +{ + local f tc + local n numbers= + + # find min/max values + local min=0xffffffff max=0 + + for n in ${@//,/ } + do + # on Linux (or with bash4) we could use `printf %.0f $n` here to + # round the number but that doesn't work on OS X (bash3) nor does + # `awk '{printf "%.0f",$1}' <<< $n` work, so just cut it off + n=${n%.*} + (( n < min )) && min=$n + (( n > max )) && max=$n + numbers=$numbers${numbers:+ }$n + done + + # print ticks + local ticks=(▁ ▂ ▃ ▄ ▅ ▆ ▇ █) + + # use a high tick if data is constant + (( min == max )) && ticks=(▅ ▆) + + tc=${#ticks[@]} + f=$(( ( (max-min) <<8)/( tc - 1) )) + (( f < 1 )) && f=1 + + for n in $numbers + do + _spark_echo -n ${ticks[$(( (((n-min)<<8)/f) ))]} + done + _spark_echo +} + +pdfwc() { local f; for f; do echo "$f" "$(pdfinfo "$f" | awk '/^Pages:/ {print $2}')"; done } + + +# nvm install script appended this to my .bashrc. I dont want to run it all the time, +# so put it in a function. +nvm-init() { + export NVM_DIR="$HOME/.nvm" + # shellcheck disable=SC1091 # may not exist, & third party + [ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh" # This loads nvm + # shellcheck disable=SC1091 # may not exist, & third party + [ -s "$NVM_DIR/bash_completion" ] && source "$NVM_DIR/bash_completion" # This loads nvm bash_completion +} + + +leap-year() { + if date -d 'february 29' &>/dev/null; then + year_days=366 + else + year_days=365 + fi + echo $year_days +} + +# 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 +} + +# note, there is also the tool gron which is meant for this, but +# this is good enough to not bother installing another tool +jq-lines() { + # https://stackoverflow.com/questions/59700329/how-to-print-path-and-key-values-of-json-file-using-jq + jq --stream -r 'select(.[1]|scalars!=null) | "\(.[0]|join(".")): \(.[1]|tojson)"' "$@" } +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. + + # https://www.bigsoft.co.uk/blog/2008/04/11/configuring-ls_colors + # change the hard to read turqouise. + # defaults dircolors --print-database. + + # the default bold green is too light. + # this explains the codes: https://gist.github.com/thomd/7667642 + export LS_COLORS="ex=1:ln=00;31" + term_bold="$(tput bold)" term_red="$(tput setaf 1)" term_green="$(tput setaf 2)" + # shellcheck disable=SC2034 # expected term_yellow="$(tput setaf 3)" term_purple="$(tput setaf 5)" term_nocolor="$(tput sgr0)" # no font attributes @@ -2194,6 +3245,16 @@ if [[ $- == *i* ]]; then # so I've thrown a bunch of things at the wall to speed it up. prompt-command() { local return=$? # this MUST COME FIRST + + # all usable colors: + # black + # green nonzero exit (pri 1) + # purple default + # purple bold + # red pwd different owner & group & not writable (pri 2) + # red bold pwd different owner & group & writable (pri 2) + # yellow + local ps_char ps_color unset IFS @@ -2201,38 +3262,52 @@ if [[ $- == *i* ]]; then history -a # save history fi - # assigned in brc2 - # shellcheck disable=SC1303 - if [[ $jr_pid ]]; then - if [[ -e /proc/$jr_pid ]]; then - kill $jr_pid - fi - unset jr_pid - fi - - case $return in - 0) ps_color="$term_purple" - ps_char='\$' - ;; - *) ps_color="$term_green" - ps_char="$return \\$" - ;; - esac + ps_color="$term_purple" + ps_char='\$' if [[ ! -O . ]]; then # not owner if [[ -w . ]]; then # writable ps_color="$term_bold$term_red" else - ps_color="$term_bold$term_green" + ps_color="$term_red" fi fi + if [[ $return != 0 ]]; then + ps_color="$term_green" + ps_char="$return \\$" + fi + # faster than sourceing the file im guessing if [[ -e /dev/shm/iank-status && ! -e /tmp/quiet-status ]]; then - eval $(< /dev/shm/iank-status) + eval "$(< /dev/shm/iank-status)" fi if [[ $MAIL_HOST && $MAIL_HOST != "$HOSTNAME" ]]; then ps_char="@ $ps_char" fi + jobs_char= + if [[ $(jobs -p) ]]; then + jobs_char='j\j ' + fi + + + # allow a function to specify a command to run after we run the next + # command. Use case: a function makes a persistent notification. If + # 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_count >= 1 )); then + + "${_psrun[@]}" ||: + _psrun_count=0 + unset _psrun + else + _psrun_count=$(( _psrun_count + 1 )) + fi + else + _psrun_count=0 + fi + # We could test if sudo is active with sudo -nv # but then we get an email and log of lots of failed sudo commands. # We could turn those off, but seems better not to. @@ -2242,13 +3317,22 @@ if [[ $- == *i* ]]; then if [[ ! $HISTFILE ]]; then ps_char="NOHIST $ps_char" fi - PS1="${PS1%"${PS1#*[wW]}"} $psudo\[$ps_color\]$ps_char\[$term_nocolor\] " + PS1="${PS1%"${PS1#*[wW]}"} $jobs_char$psudo\[$ps_color\]$ps_char\[$term_nocolor\] " + + # copy of what is automatically added by guix. + # adds [env] to PS1 if GUIX_ENVIRONMENT is set and PS1 contains '$'; + if [ -n "$GUIX_ENVIRONMENT" ]; then + if [[ $PS1 =~ (.*)"\\$" ]]; then + PS1="${BASH_REMATCH[1]} [env]\\\$ " + fi + fi + # set titlebar. instead, using more advanced # titelbar below #echo -ne "$_title_escape $HOSTNAME ${PWD/#$HOME/~} \007" } - PROMPT_COMMAND=prompt-command + PROMPT_COMMAND=(prompt-command) if [[ $TERM == screen* ]]; then _title_escape="\033]..2;" @@ -2258,18 +3342,22 @@ if [[ $- == *i* ]]; then _title_escape="\033]0;" fi - settitle () { - # this makes it so we show the current command if - # one is running, otherwise, show nothing + # make the titlebar be the last command and the current directory. + auto-window-title () { - if [[ $1 == prompt-command ]]; then + + # These are some checks to help ensure we dont set the title at + # times that the debug trap is running other than the case we + # want. Some of them might not be needed. + if (( ${#FUNCNAME[@]} != 1 || ${#BASH_ARGC[@]} != 2 || BASH_SUBSHELL != 0 )); then return 0 fi - if (( ${#BASH_ARGC[@]} == 1 && BASH_SUBSHELL == 0 )); then - echo -ne "$_title_escape ${PWD/#$HOME/~} " - printf "%s" "$*" - echo -ne "\007" + if [[ $1 == prompt-command ]]; then + return 0 fi + echo -ne "$_title_escape ${PWD/#$HOME/~} " + printf "%s" "$*" + echo -ne "\007" } # note, this wont work: @@ -2280,7 +3368,7 @@ if [[ $- == *i* ]]; then # condition from the screen man page i think. # note: duplicated in tx() if [[ $TERM == *(screen*|xterm*|rxvt*) ]]; then - trap 'settitle "$BASH_COMMAND"' DEBUG + trap 'auto-window-title "$BASH_COMMAND"' DEBUG else trap DEBUG fi @@ -2293,8 +3381,10 @@ fi # best practice unset IFS -# shellcheck disable=SC1090 -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* +if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then + # shellcheck disable=SC1091 + source "$HOME/.rvm/scripts/rvm" +fi # I had this idea to start a bash shell which would run an initial # command passed through this env variable, then continue on