X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=b5d45969c67b9364d6dfc783d187be1873d27707;hb=165008e5b82c81ebff1061c8f8294c3bc6e9dced;hp=556c5ef04e743bb2208cc54dd7ae3d7cd1569cbe;hpb=6061d88c7d5beda3e974943eb8676f7c39d4ae9f;p=distro-setup diff --git a/brc b/brc index 556c5ef..b5d4596 100644 --- a/brc +++ b/brc @@ -12,24 +12,27 @@ elif [[ -s ~/.iank/err ]]; then source ~/.iank/err fi -t2() { - echo t2 - popd - grep sdf sdfd - echo wtf -} -t1() { - echo t1 - trap - t2 a b c -} +# In t8, it runs clear_console for login shells by default. I don't want +# my console cleared. And linux ttys get cleared without this. +if shopt login_shell >/dev/null && [[ -e ~/.bash_logout ]]; then + rm ~/.bash_logout +fi + +# for testing error catching: +# t2() { +# echo t2 +# grep sdf sdfd +# echo wtf +# } +# t1() { +# echo t1 +# t2 a b c +# } # * settings CDPATH=. -set -o pipefail - # remove all aliases. aliases provided by the system tend to get in the way, # for example, error happens if I try to define a function the same name as an alias unalias -a @@ -156,28 +159,9 @@ if [[ $- == *i* ]]; then fi - -# history number. History expansion is good. -PS4='$LINENO+ ' -# history file size limit, set to unlimited. -# this needs to be different from the default because -# default HISTFILESIZE is 500 and could clobber our history -HISTFILESIZE= -# max commands 1 session can append/read from history -HISTSIZE=1000000 -# the time format display when doing the history command -# also, setting this makes the history file record time -# of each command as seconds from the epoch -HISTTIMEFORMAT="%Y-%m-%d %I:%M %p " -# consecutive duplicate lines dont go in history -HISTCONTROL=ignoredups -# works in addition to HISTCONTROL to do more flexible things -# it could also do the same things as HISTCONTROL and thus replace it, -# but meh. dunno why, but just " *" does glob expansion, so use [ ] to avoid it. -HISTIGNORE='pass *:[ ]*:otp *:oathtool *' - export BC_LINE_LENGTH=0 +# ansible option export PROFILE_TASKS_TASK_OUTPUT_LIMIT=100 # note, if I use a machine I dont want files readable by all users, set @@ -870,7 +854,7 @@ grep ps and output in a nice format" # final grep is because some commands tend to have a lot of trailing spaces y=$(echo "$x" | grep -iP "$@" | grep -o '.*[^ ]') ||: if [[ $y ]]; then - echo "$x" | head -n 1 + echo "$x" | head -n 1 || [[ $? == 141 ]] echo "$y" fi }