X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=9fff367476d4fb1413831f1f4255e6f5be113f53;hb=6459d4698ef983f7b1540589b87013c76913393d;hp=80a4ae199b04c60a3ce688c312469c6df4b170d0;hpb=8452f3f3e0b837ba4e616e062787d726d7888b76;p=distro-setup diff --git a/brc b/brc index 80a4ae1..9fff367 100644 --- a/brc +++ b/brc @@ -177,8 +177,6 @@ export PROFILE_TASKS_TASK_OUTPUT_LIMIT=100 # note, if I use a machine I dont want files readable by all users, set # umask 077 # If fewer than 4 digits are entered, leading zeros are assumed -C_DEFAULT_DIR=/a - # i for insensitive. the rest from # X means dont remove the current screenworth of output upon exit # R means to show colors n things @@ -186,12 +184,21 @@ export LESS=RXi export SYSTEMD_LESS=$LESS # * include files -for _x in /a/bin/distro-functions/src/* /a/bin/!(githtml)/*-function?(s); do - source "$_x" -done -unset _x -# so I can share my bashrc -for x in /a/bin/bash_unpublished/source-!(.#*); do source $x; done + +# generated instead of dynamic for the benefit of shellcheck +#for x in /a/bin/distro-functions/src/* /a/bin/!(githtml)/*-function?(s); do echo source $x ; done +source /a/bin/distro-functions/src/identify-distros +source /a/bin/distro-functions/src/package-manager-abstractions +source /a/bin/distro-setup/path_add-function +source /a/bin/ds/path_add-function +source /a/bin/log-quiet/logq-function +source /a/bin/small-misc-bash/ll-function +source /a/bin/small-misc-bash/psg-function +# for x in /a/bin/bash_unpublished/source-!(.#*); do echo source $x; done +source /a/bin/bash_unpublished/source-semi-priv +source /a/bin/bash_unpublished/source-state + +# shellcheck source=./path_add-function source $(dirname $(readlink -f $BASH_SOURCE))/path_add-function source /a/bin/log-quiet/logq-function # if someone exported $SOE (stop on error), catch errors. @@ -219,8 +226,9 @@ path_add --ifexists --end /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-t path_add --ifexists --end /a/opt/scancode-toolkit-3.0.2 export WCDHOME=/a # based on readme.debian. dunno if this will break on other distros. -_x=/usr/share/wcd/wcd-include.sh -if [[ -e $_x ]]; then source $_x; fi +if [[ -s /usr/share/wcd/wcd-include.sh ]]; then + source /usr/share/wcd/wcd-include.sh +fi # * aliases @@ -261,9 +269,9 @@ unalias ls ll grep &>/dev/null ||: # file cut copy and paste, like the text buffers :) # I havnt tested these. -_fbufferinit() { # internal use by +_fbufferinit() { # internal use ! [[ $my_f_tempdir ]] && my_f_tempdir=$(mktemp -d) - rm -rf "$my_f_tempdir"/* + rm -rf "${my_f_tempdir:?}"/* } fcp() { # file cp _fbufferinit @@ -287,7 +295,7 @@ complete -F _longopt la lower low rlt rld rl lld ts ll dircp ex fcp fct fpst gr _cdiff-prep() { # join options which are continued to multiples lines onto one line local first=true - grep -vE '^([ \t]*#|^[ \t]*$)' "$1" | while IFS= read -r line; do + while IFS= read -r line; do # remove leading spaces/tabs. assumes extglob if [[ $line == "[ ]*" ]]; then line="${line##+( )}" @@ -301,7 +309,7 @@ _cdiff-prep() { else pastline="$pastline $line" fi - done + done < <(grep -vE '^([ \t]*#|^[ \t]*$)' "$1") echo "$pastline" >> "$2" } @@ -334,7 +342,8 @@ khcopy() { } a() { - local x=$(readlink -nf "${1:-$PWD}") + 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 @@ -417,6 +426,14 @@ bpush() { install-my-scripts switch-mail-host $HOSTNAME $1 } +lipush() { + rsync $@ --delete-excluded -ahviSAXPH --specials --devices --delete --relative \ + --exclude-from=/p/c/li-rsync-excludes /a/bin /a/exe /a/h /a/c /p/c/machine_specific/li /a/opt/{emacs,emacs-debianstable,mu} root@li:/ +} +lipushnoe() { + rsync $@ --delete-excluded -ahviSAXPH --specials --devices --delete --relative \ + --exclude-from=/p/c/li-rsync-excludes /a/bin /a/exe /a/h /a/c /p/c/machine_specific/li root@li:/ +} btc() { @@ -465,6 +482,7 @@ fi caa() { git commit --amend --no-edit -a; } caf() { + # shellcheck disable=SC2033 find -L $1 -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 \) \ @@ -495,10 +513,10 @@ cdiff() { # setup for format of postfix, eg: # option = stuff[,] # [more stuff] - local pastline - local unified="$(mktemp)" - local f1="$(mktemp)" - local f2="$(mktemp)" + local pastline unified f1 f2 + unified="$(mktemp)" + f1="$(mktemp)" + f2="$(mktemp)" _cdiff-prep "$1" "$f1" _cdiff-prep "$2" "$f2" cat "$f1" "$f2" | grep -Po '^[^=]+=' | sort | uniq > "$unified" @@ -530,7 +548,8 @@ cat-new-files() { local start=$SECONDS local dir="$1" inotifywait -m "$dir" -e create -e moved_to | - while read filedir _ file; do + # shellcheck disable=SC2030 + while read -r filedir _ file; do cat "$filedir$file" hr calc $((SECONDS - start)) / 60 @@ -539,6 +558,7 @@ cat-new-files() { } +# shellcheck disable=SC2032 chown() { # makes it so chown -R symlink affects the symlink and its target. if [[ $1 == -R ]]; then @@ -579,7 +599,7 @@ da() { # do all local host "$@" for host in x2 tp kd; do - ssh $host "$@" + ssh $host $(printf "") done } @@ -598,7 +618,8 @@ debian_pick_mirror () { # this is idempotent. the only way to identify debian sources is to # note the original server, so we put it in a comment so we can # identify it later. - local file=$(mktemp -d)/f # safe way to get file name without creating one + local file + file=$(mktemp -d)/f # safe way to get file name without creating one sudo netselect-apt -o "$file" || return 1 url=$(grep ^\\w $file | head -n1 | awk '{print $2}') sudo cp -f /etc/apt/sources.list /etc/apt/sources.list-original @@ -656,6 +677,7 @@ eless() { less /var/log/exim4/mainlog } +# shellcheck disable=SC2032 f() { # cd forward c + @@ -673,7 +695,7 @@ fa() { faf() { # find all files find -L $1 -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 + -o -name .undo-tree-history -prune \) -type f 2>/dev/null } # one that comes with distros is too old for newer devices @@ -827,7 +849,7 @@ fsdiff () { echo "$line" >> "$m" msize=$((msize + 1)) fi - done < <(find -type f ) + done < <(find . -type f ) if $missing; then echo "$m" (( msize <= 100 )) && cat $m @@ -843,7 +865,8 @@ fsdiff-test() { echo nok > b mkdir c echo ok > c/d - local x=$(mktemp -d) + local x + x=$(mktemp -d) mkdir $x/c echo different > $x/c/d echo ok > $x/a @@ -929,7 +952,8 @@ Output the directory of PATH, or just PATH if it is a directory." if [[ -d $1 ]]; then echo "$1" else - local dir="$(dirname "$1")" + local dir + dir="$(dirname "$1")" if [[ -d $dir ]]; then echo "$dir" else @@ -941,14 +965,15 @@ Output the directory of PATH, or just PATH if it is a directory." git_empty_branch() { # start an empty git branch. carefull, it deletes untracked files. [[ $# == 1 ]] || { echo 'need a branch name!'; return 1;} - local gitroot - gitroot || return 1 # function to set gitroot - builtin cd "$gitroot" + local root + root=$(gitroot) || return 1 # function to set gitroot + builtin cd "$root" git symbolic-ref HEAD refs/heads/$1 rm .git/index git clean -fdx } +# shellcheck disable=SC2120 gitroot() { local help="Usage: gitroot [--help] Print the full path to the root of the current git repo @@ -959,7 +984,8 @@ and works in older versions of git which did not have that." echo "$help" return fi - local p=$(git rev-parse --git-dir) || { echo "error: not in a git repo" ; return 1; } + local p + p=$(git rev-parse --git-dir) || { echo "error: not in a git repo" ; return 1; } [[ $p != /* ]] && p=$PWD echo "${p%%/.git}" } @@ -971,7 +997,7 @@ gitian() { gh() { # i got an error, gh not found when doing a pull request, it seems like it wants itself in it\'s path. local _oldpath="$PATH" - PATH="$PATH:~/node_modules/.bin" + PATH="$PATH:$HOME/node_modules/.bin" command gh "$@" PATH="$_oldpath" } @@ -1018,9 +1044,8 @@ rg() { hstatus() { # do git status on published repos cd /a/bin/githtml - do_hr=false for x in *; do - cd `readlink -f $x`/.. + cd $(readlink -f $x)/.. status=$(i status -s) || pwd if [[ $status ]]; then hr @@ -1033,11 +1058,11 @@ hstatus() { hl() { # history limit. Write extra history to archive file. # todo: this is not working or not used currently - local max_lines linecount tempfile prune_lines x + local max_lines linecount prune_lines x local harchive="${HISTFILE}_archive" for x in "$HISTFILE" "$harchive"; do [[ -e $x ]] || { touch "$x" && echo "notice from hl(): creating $x"; } - if [[ ! $x || ! -e $x || ! -w $x || $(stat -c "%u" "$x") != $EUID ]]; then + if [[ ! $x || ! -e $x || ! -w $x || $(stat -c "%u" "$x") != "$EUID" ]]; then echo "error in hl: history file \$x:$x no good" return 1 fi @@ -1047,8 +1072,8 @@ hl() { # history limit. Write extra history to archive file. [[ $max_lines =~ ^[0-9]+$ ]] || { echo "error in hl: failed to get max line count"; return 1; } linecount=$(wc -l < $HISTFILE) # pipe so it doesnt output a filename [[ $linecount =~ ^[0-9]+$ ]] || { echo "error in hl: wc failed"; return 1; } - if (($linecount > $max_lines)); then - prune_lines=$(($linecount - $max_lines)) + if ((linecount > max_lines)); then + prune_lines=$((linecount - max_lines)) head -n $prune_lines "$HISTFILE" >> "$harchive" \ && sed --follow-symlinks -ie "1,${prune_lines}d" $HISTFILE fi @@ -1219,7 +1244,7 @@ lower() { # make first letter of filenames lowercase. local x for x in "$@"; do if [[ ${x::1} == [A-Z] ]]; then - y=$(tr "[A-Z]" "[a-z]" <<<"${x::1}")"${x:1}" + y=$(tr '[:upper:]' '[:lower:]' <<<"${x::1}")"${x:1}" safe_rename "$x" "$y" || return 1 fi done @@ -1241,9 +1266,9 @@ make-targets() { } mbenable() { - mb=$1 - dst=/m/4e/$1 - src=/m/md/$1 + local mb=$1 + dst=/m/4e/$mb + src=/m/md/$mb set -x [[ -e $src ]] || { set +x; return 1; } mv -T $src $dst || { set +x; return 1; } @@ -1253,9 +1278,9 @@ mbenable() { set +x } mbdisable() { - mb=$1 - dst=/m/md/$1 - src=/m/4e/$1 + 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 @@ -1276,7 +1301,7 @@ mkc() { } mkct() { - mkc `mktemp -d` + mkc $(mktemp -d) } mkt() { # mkdir and touch file @@ -1285,6 +1310,7 @@ mkt() { # mkdir and touch file touch "$path" } +# shellcheck disable=SC2032 mkdir() { command mkdir -p "$@"; } mo() { xset dpms force off; } # monitor off @@ -1314,6 +1340,7 @@ ngo() { } nopanic() { + # shellcheck disable=SC2024 sudo tee -a /var/log/exim4/paniclog-archive = nth )); do name="$(echo "$name" | head -n $nth | tail -n 1 )" - read -p "$name [Y/n] " ask + read -r -p "$name [Y/n] " ask if [[ ! $ask || $ask == [Yy] ]]; then x=$( echo "$name" | gr -o "^\s*[0-9]*" ) echo $x | restore-trash > /dev/null @@ -1441,11 +1473,12 @@ q() { # start / launch a program in the backround and redir output to null "$@" &> /dev/null & } +# shellcheck disable=SC2120 r() { history -a # save history - exit "$@" + exit ${1:0} # i had this redir, not sure why -# exit "$@" 2>/dev/null + # exit "$@" 2>/dev/null } rbpipe() { rbt post -o --diff-filename=- "$@"; } @@ -1490,8 +1523,8 @@ rlu() { # [OPTS] HOST PATH # eg. rlu -opts frodo /testpath # relative paths will expanded with readlink -f. opts=("${@:1:$#-2}") # 1 to last -2 - path="${@:$#}" # last - host="${@:$#-1:1}" # last -1 + path="${*:$#}" # last + host="${*:$#-1:1}" # last -1 if [[ $path == .* ]]; then path=$(readlink -f $path) fi @@ -1523,11 +1556,13 @@ 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 - local port=$(ssh $1<$tmp/timing @@ -1696,7 +1732,7 @@ slog() { t ) do_stamp=true ;; esac done - shift $(($OPTIND - 1)) + shift $((OPTIND - 1)) arg_base+=$1 [[ -e $logdir ]] || mkdir -p $logdir $do_stamp && arg_base+=$(date +%F.%T%z) @@ -1736,7 +1772,7 @@ srm () { srun() { scp $2 $1:/tmp - ssh $1 /tmp/${2##*/} "${@:2}" + ssh $1 /tmp/${2##*/} $(printf "%q\n" "${@:2}") } ssh() { @@ -1773,7 +1809,7 @@ t() { args+=("$x") fi done - [[ ! ${args[@]} ]] || trash-put "${args[@]}" + (( ! ${#args[@]} )) || trash-put "${args[@]}" else rm -rf "$@" fi @@ -1781,6 +1817,7 @@ t() { tclock() { + local x clear date +%l:%_M len=60 @@ -1898,7 +1935,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; } @@ -1910,12 +1947,13 @@ trc() { tu() { - local s; - local dir="$(dirname "$1")" + local s dir + dir="$(dirname "$1")" if [[ -e $1 && ! -w $1 || ! -w $(dirname "$1") ]]; then s=s; fi - $s teeu "$@" + # full path for using in some initial setup steps + $s /a/exe/teeu "$@" } tx() { # toggle set -x, and the prompt so it doesnt spam @@ -1947,7 +1985,7 @@ psnetns() { netns=$1 ps -w | head -n 1 s find -L /proc/[1-9]*/task/*/ns/net -samefile /run/netns/$netns | cut -d/ -f5 | \ - while read l; do + while read -r l; do x=$(ps -w --no-headers -p $l); if [[ $x ]]; then echo "$x"; else echo $l; fi; done @@ -1976,7 +2014,8 @@ virshrm() { } vm-set-listen(){ - local t=$(mktemp) + local t + t=$(mktemp) local vm=$1 local ip=$2 s virsh dumpxml $vm | sed -r "s/( /dev/null; then - __git_ps1() { - : - } - fi # this needs to come before next ps1 stuff # this stuff needs bash 4, feb 2009, @@ -2149,7 +2175,7 @@ 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 - local psc pst ps_char ps_color stale_subvol + local ps_char ps_color unset IFS history -a # save history @@ -2174,7 +2200,7 @@ if [[ $- == *i* ]]; then # faster than sourceing the file im guessing eval $(< /dev/shm/iank-status) - if [[ ! $SSH_CLIENT && $MAIL_HOST != $HOSTNAME ]]; then + if [[ ! $SSH_CLIENT && $MAIL_HOST != "$HOSTNAME" ]]; then ps_char="@ $ps_char" fi PS1="${PS1%"${PS1#*[wW]}"} \[$ps_color\]$ps_char\[$term_nocolor\] " @@ -2187,7 +2213,7 @@ if [[ $- == *i* ]]; then else local title_escape="\033]0;" fi - if [[ $* != prompt-command ]]; then + if [[ $0 != prompt-command ]]; then echo -ne "$title_escape$USER@$HOSTNAME ${PWD/#$HOME/~} " printf "%s" "$*" echo -ne "\007" @@ -2216,7 +2242,8 @@ reset-konsole() { } reset-sakura() { - while read k v; do + while -r read k v; do + # shellcheck disable=SC2154 setini $k $v sakura /a/c/subdir_files/.config/sakura/sakura.conf done <<'EOF' colorset1_back rgb(33,37,39 @@ -2255,7 +2282,7 @@ EOF if [[ "$SUDOD" ]]; then cd "$SUDOD" unset SUDOD -elif [[ -d /a ]] && [[ $PWD == $HOME ]] && [[ $- == *i* ]]; then +elif [[ -d /a ]] && [[ $PWD == "$HOME" ]] && [[ $- == *i* ]]; then cd /a fi @@ -2274,7 +2301,7 @@ mypyenvinit () { echo "error: dont be root. make sure pyenv is installed" return 1 fi - export PATH="~/.pyenv/bin:$PATH" + export PATH="$HOME/.pyenv/bin:$PATH" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" } @@ -2298,6 +2325,8 @@ path_add --end $HOME/.cargo/bin # taken from default changes to bashrc and bash_profile path_add --end $HOME/.rvm/bin + +# shellcheck disable=SC1090 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* export BASEFILE_DIR=/a/bin/fai-basefiles