#!/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
- # 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
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.
export LESS=RXij12
export SYSTEMD_LESS=$LESS
+
export NNN_COLORS=2136
export SL_FILES_DIR=/b/ds/sl/.iank
# 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
fi
done
}
+# like running cl <enter> a <enter>
+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.
(( 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 <<EOF
+### $cmd
+
+\`\`\`
+EOF
+ $cmd
+ cat <<'EOF'
+
+```
+
+EOF
+ done
+}
+
#### end fsf section
cp "$my_f_tempdir"/* "$target"
}
-_khfix_common() {
- local host ip port file key
+_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
host_entry=$host
fi
if [[ $host != "$ip" ]]; then
- key=$(ssh-keygen -F "$host_entry" -f $file | sed -r 's/^.*([^ ]+ +[^ ]+) *$/\1/')
+ 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
- key=$(ssh-keygen -F "$ip_entry" -f $file | sed -r 's/^.*([^ ]+ +[^ ]+) *$/\1/')
+ 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 without syncing to root user
+ _khfix-common "$@" || return 1
ssh $1 :
}
-khcopy() {
- _khfix_common "$@"
- ssh-copy-id $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
- echo -n "$x" | xclip -selection clipboard
- echo -n "$x" | xclip
+ # 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}
caf() {
local file
-find -L "$@" -type f -not \( -name .svn -prune -o -name .git -prune \
+ 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 \) -printf '%h\0%d\0%p\n' | sort -t '\0' -n \
- | awk -F '\0' '{print $3}' 2>/dev/null | while read -r file; do
+ | awk -F '\0' '{print $3}' 2>/dev/null | while read -r file; do
hr
printf "%s\n" "$file"
hr
cat "$file"
-done
+ done
}
ccomp cat cf caf
cx() {
chmod +X "$@"
- }
+}
cam() {
git commit -am "$*"
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 "$@"
# Don't return 1 on nonmatch because this is meant to be
# interactive, not in a conditional.
if [[ ${#@} == 1 ]]; then
- grep --exclude-dir='*.emacs.d' --exclude-dir='*.git' -riIP --color=auto "$@" . || [[ $? == 1 ]]
+ grep -E --exclude-dir='*.emacs.d' --exclude-dir='*.git' -riIP --color=auto "$@" . || [[ $? == 1 ]]
else
- grep --exclude-dir='*.emacs.d' --exclude-dir='*.git' -riIP --color=auto "$@" || [[ $? == 1 ]]
+ grep -E --exclude-dir='*.emacs.d' --exclude-dir='*.git' -riIP --color=auto "$@" || [[ $? == 1 ]]
fi
}
ccomp grep gr grr
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
c "$(mktemp -d)"
pkg=$1
# shellcheck disable=SC2012
- cached=$(ls -t /var/cache/apt/archives/${pkg}_* | tail -n1 2>/dev/null) ||:
+ cached=$(ls -t /var/cache/apt/archives/${pkg}_* 2>/dev/null | tail -n1 2>/dev/null) ||:
if [[ $cached ]]; then
m cp $cached .
else
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
}
sk() {
- # disable a warning with:
- # shellcheck disable=SC2206 # reasoning
-
- # see bash-template/style-guide.md for justifications
-
- local quotes others
+ # 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 -W 999 -x -e $quotes,$others "$@" || return $?
+ shellcheck -W 999 -x -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.
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
pson() {
PROMPT_COMMAND=(prompt-command)
if [[ $TERM == *(screen*|xterm*|rxvt*) ]]; then
- trap 'settitle "$BASH_COMMAND"' DEBUG
+ trap 'auto-window-title "$BASH_COMMAND"' DEBUG
fi
}
}
m() { printf "%s\n" "$*"; "$@"; }
+m2() { printf "%s\n" "$*" >&2; "$@"; }
# update file. note: duplicated in mail-setup.
# updates $ur u result to true or false
}
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,
# on-battery
on-bat() {
if [[ -e /sys/class/power_supply/AC/online && $(</sys/class/power_supply/AC/online) == 0 ]]; then
+ return 0
+ else
return 1
fi
}
# ls count. usage: pass a directory, get the number of files.
# https://unix.stackexchange.com/questions/90106/whats-the-most-resource-efficient-way-to-count-how-many-files-are-in-a-director
lsc() {
- # shellcheck disable=SC2790 # intentional
+ # shellcheck disable=SC2790 disable=SC2012 # intentional
ls -Uq "$@"|wc -l
}
# run then notify. close notification after the next prompt.
rn() {
"$@"
- dunstify -u critical "$*"
+ dunstify -u critical -h string:x-dunst-stack-tag:profanity "$*"
_psrun=(dunstctl close-all)
}
n() {
- dunstify -u critical n
+ dunstify -u critical -h string:x-dunst-stack-tag:profanity n
_psrun=(dunstctl close-all)
}
}
+fsf-sv-header() {
+ local f
+ local -a f_maybe
+ if ! type -p sponge &>/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[@]}" <<EOF | sponge "$f"
+The following is the GNU All-permissive License as recommended in
+<https://www.gnu.org/licenses/license-recommendations.en.html>
+
+Copyright (C) $(date +%Y) Free Software Foundation <sysadmin@fsf.org>
+
+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 <https://savannah.gnu.org/maintenance/fsf/>.
+
+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
# 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
+ export LS_COLORS="ex=1:ln=00;31"
term_bold="$(tput bold)"
term_red="$(tput setaf 1)"
# 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
history -a # save history
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)"
fi
# make the titlebar be the last command and the current directory.
- settitle () {
+ auto-window-title () {
# These are some checks to help ensure we dont set the title at
# 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
iankelling.org / git / distro-setup / blobdiff