#exec 2>/a/tmp/bashlog
-# The default of sourcing this file for all ssh commands is a buggy practice. Normally, this
-# file is not sourced when a script is run, and we should follow that convention.
-# we can override with ssh -t which sets $SSH_TTY, which we can detect
+# By default this file is sourced for all ssh commands. This is wonky.
+# Normally, this file is not sourced when a script is run, and it would be much
+# better and more consistent if that also happened when when running a script
+# over ssh. so here we test for conditions of a script under ssh and return if
+# so. we can override with ssh -t which sets $SSH_TTY, which we can detect
+# But inside a script, ssh -t won't work, because we aren't using a tty at all.
+# So we need something else. Command lines and env variables sent across ssh are strictly limited.
+# We could override an obscure unused LC_var, like telephone, or we could transfer a file.
+# But I choose to set SendEnv and AcceptEnv ssh vars for BASH_LOGIN_SHELL.
+# In a private file, i have aliases for if $- == *i*, ssh -t, else ssh.
+
+[[ $- != *i* && ! $SSH_CONNECTION ]] && export BASH_LOGIN_SHELL=true
+
if [[ $SSH_CONNECTION ]] \
&& [[ $- == *c* ]] \
&& [[ ! $SSH_TTY ]] \
+ && [[ ! $BASH_LOGIN_SHELL == true ]] \
&& [[ $- != *i* ]]; then
return
fi
-# Side note on ssh. Command lines and env variables sent across ssh are strictly limited.
-# If we did want to easily pass info, we could override an obscure unused LC_var
-# Or we could set SendEnv and AcceptEnv ssh vars, or we could transfer a file.
+# Side note on ssh.
source "$x"
done
-source $HOME/bin/bash_private # so I can share my bashrc
+source $HOME/bin/semi-private # so I can share my bashrc
source $HOME/path_add-function
# there is probably a more proper way, but I didn't find any easily on google
unset GNOME_KEYRING_CONTROL
-path_add /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-tools
-
#use extra globing features. See man bash, search extglob.
shopt -s extglob
#include .files when globbing.
shopt -s dotglob
+#but ignore files name . and ..
+#those are default when this is set to anything, so we just set it to one of them
+export GLOBIGNORE=.
-# disabled because it is broken with bash_completion package. It is a known bug they hope to fix.
-# When a glob expands to nothing, make it an empty string instead of the literal characters.
-# shopt -s nullglob
+# broken with bash_completion package. Saw a bug for this once. Don't anymore.
+# still broken in wheezy
+# still buggered in latest stable from the web, version 2.1
+# perhaps its fixed in newer git version, which fails to make for me
+# this note is from 6-2014
+#shopt -s nullglob
# make tab on an empty line do nothing
shopt -s no_empty_cmd_completion
-
# advanced completion
# http://bash-completion.alioth.debian.org/
-# i was using the git version for a while. not bothering now.
-# seems a bit inefficient to source it here, and let the system bash
-# scripts source it too. todo, investigate if I am super bored sometime
-if [[ -r "/usr/share/bash-completion/bash_completion" ]]; then
+# might be sourced by the system already, but I've noticed it not being sourced before
+if ! type _init_completion &> /dev/null && [[ -r "/usr/share/bash-completion/bash_completion" ]]; then
. /usr/share/bash-completion/bash_completion
fi
+
# fix spelling errors for cd, only in interactive shell
shopt -s cdspell
# append history instead of overwritting it
# attempt to save multiline single commands as single history entries.
shopt -s cmdhist
+
+# inside emacs fixes
+if [[ $INSIDE_EMACS ]]; then
+ export INSIDE_EMACS
+ export PAGER=cat
+ export MANPAGER=cat
+ # for readline-complete.el
+ stty echo
+fi
+
+
if [[ $- == *i* ]]; then
# for readline-complete.el
if [[ $INSIDE_EMACS ]]; then
bind 'set horizontal-scroll-mode on'
bind 'set print-completions-horizontally on'
- stty echo
else
- stty werase undef lnext undef stop undef start undef
- # terminal keys: C-c, C-z. the rest defined by stty -a are, at least in
- # gnome-terminal, overridden by bash, or disabled by the system
-
# arrow keys. for other terminals, see http://unix.stackexchange.com/questions/10806/how-to-change-previous-next-word-shortcut-in-bash
if [[ $TERM == "xterm" ]]; then
bind '"\e[1;5C": shell-forward-word' 2>/dev/null
bind '"\eOc": shell-forward-word'
bind '"\eOd": shell-backward-word'
fi
+ # terminal keys: C-c, C-z. the rest defined by stty -a are, at least in
+ # gnome-terminal, overridden by bash, or disabled by the system
+ stty werase undef lnext undef stop undef start undef
+
fi
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 to history
+# max commands 1 session can append/read from history
HISTSIZE=100000
-# this needs to be different from the derault because
-# default HISTFILESIZE is 500 and could clobber our history
+# my own history size limit based on lines
+HISTFILELINES=1000000
HISTFILE=$HOME/.bh
+# 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="%I:%M %p %m/%d "
-# duplicate, single letter, and space prepended commands do not go in history
-HISTIGNORE="&:?: *"
+# consecutive duplicate lines don't go in history
+HISTCONTROL=ignoredups
+# just defensively unsetting this
+# this var can replace HISTCONTROL to do more flexible things like
+# not saving single char history items or specific names
+unset HISTIGNORE
export BC_LINE_LENGTH=0
-path_add /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-tools
+path_add --ifexists /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-tools
path_add $HOME/bin/bash-programs-by-ian/utils
# note, if I use a machine I don't want files readable by all users, set
# umask 077 # If fewer than 4 digits are entered, leading zeros are assumed
alias d='builtin bg'
complete -A stopped -P '"%' -S '"' d
-alias his='history'
+alias hi='history'
# note: gksudo is recommended for X apps because it does not set the
}
+if type ack-grep >/dev/null 2>&1; then
+ alias ack=ack-grep
+fi
+
gr() {
grep -i --binary-files=without-match --color=auto "$@"
-
-
calc() { echo "scale=3; $*" | bc -l; }
-cd() {
- if [[ $1 == .. ]]; then
- echo 'be cool, use the alias ".." instead :)'
- fi
- builtin cd "$@"
-}
-
# makes it so chown -R symlink affects the symlink and its target.
chown() {
complete -o bashdefault -o default -o nospace -F _git i 2>/dev/null \
|| complete -o default -o nospace -F _git i
+# fast commit
+ic() {
+ git commit -am "$*"
+}
# insensitive find
ifn () {
+
l() {
if [[ $PWD == /[iap] ]]; then
command ls -A --color=auto -I lost+found "$@"
fi
}
pf() {
+ # scratch a very annoying itch.
+ # package description width as wide as the screen, and package name field small
+ # aptitude manual can't figure out how wide emacs terminal is,
+ # of course it doesn't consult the $COLUMNS variable...
+ # and in a normal terminal, it makes the package name field ridiculously big
+ # also, remove that useless dash before the description
if [[ $EUID == 0 ]]; then
- aptitude search "$@"
+ aptitude -F "%c%a%M %p %$((COLUMNS - 30))d" -w $COLUMNS search "$@"
else
- sudo aptitude search "$@"
+ sudo aptitude -F "%c%a%M %p %$((COLUMNS - 30))d" -w $COLUMNS search "$@"
fi
}
fi
-# test existence
+# test existence / exists
te() {
local ret=0
for x in "$@"; do
perm_fix() {
local parent
if [[ $EUID == 0 ]]; then
- [[ -e $1 ]] || touch $1
+ te "$1" || touch $1
if [[ $(stat -c "%u" "$1") == 0 ]] ; then
-
argdir=$(getdir "$1")
if [[ $(stat -c "%u" "$argdir") != 0 ]] ; then
if ! chown "--reference=$argdir" "$1"; then
r() {
- exit "$@"
+ exit "$@" 2>/dev/null
+}
+
+# trash-restore lists everything that has been trashed at or below CWD
+# This picks out files just in CWD, not subdirectories,
+# which also match grep $1, usually use $1 for a time string
+# which you get from running restore-trash once first
+pick-trash() {
+ local name x ask
+ local nth=1
+ # last condition is to not ask again for ones we skipped
+ while name="$( echo | restore-trash | gr "$PWD/[^/]\+$" | gr "$1" )" \
+ && [[ $name ]] && (( $(wc -l <<<"$name") >= nth )); do
+ name="$(echo "$name" | head -n $nth | tail -n 1 )"
+ read -p "$name [Y/n] " ask
+ if [[ ! $ask || $ask == [Yy] ]]; then
+ x=$( echo "$name" | gr -o "^\s*[0-9]*" )
+ echo $x | restore-trash > /dev/null
+ elif [[ $ask == [Nn] ]]; then
+ nth=$((nth+1))
+ else
+ return
+ fi
+ done
}
# rsync, root is required to keep permissions right.
# use -ll, less secure but faster.
srm () {
- srm -ll "$@"
+ command srm -ll "$@"
}
# sudo redo. be aware, this command may not work right on strange distros or earlier software
hl() { # history limit. Write extra history to archive file.
- local max_lines linecount tempfile
- for x in $HISTFILE ${HISTFILE}_archive; do
- if [[ -e $x && ! -w $x ]]; then
- echo "error: history file $x is not writable."
+ local max_lines linecount tempfile prune_lines
+ 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
+ echo "error in hl: history file \$x:$x no good"
return 1
fi
done
- history -w
- if [[ $1 ]]; then
- max_lines=$(($1 * 2)) # 2 lines for every history command
- else
- max_lines=1000000
- fi
- linecount=$(wc -l < $HISTFILE)
- linecount=${linecount:-0}
+ history -a # save history
+ max_lines=$HISTFILELINES
+ [[ $max_lines =~ ^[0-9]+$ ]] || { echo "error in hl: failed to get max line count"; return 1; }
+ linecount=$(wc -l < $HISTFILE) # pipe so it doesn't output a filename
+ [[ $linecount =~ ^[0-9]+$ ]] || { echo "error in hl: wc failed"; return 1; }
if (($linecount > $max_lines)); then
prune_lines=$(($linecount - $max_lines))
- tempfile=$(mktemp)
- [[ $tempfile ]] || { echo mktemp failed; return 1; }
- head -$prune_lines $HISTFILE >> ${HISTFILE}a \
- && sed -e "1,${prune_lines}d" $HISTFILE > $tempfile \
- && mv $tempfile $HISTFILE
+ head -n $prune_lines "$HISTFILE" >> "$harchive" \
+ && sed -ie "1,${prune_lines}d" $HISTFILE
fi
- perm_fix $HISTFILE
- perm_fix ${HISTFILE}_archive
- history -c
- history -r
}
# commands to run when bash exits normally
ps_char='\$'
;;
1) ps_color="$(get_term_color green)"
- ps_char=$return
+ ps_char="$return \\$"
;;
*) ps_color="$(get_term_color yellow)"
- ps_char=$return
+ ps_char="$return \\$"
;;
esac
if [[ ! -O . ]]; then # not owner
ps_color="$(get_term_color bold green)"
fi
fi
- PS1="${PS1/%!(*[wW]*)}$(__git_ps1 ' (%s)') \[$ps_color\]$ps_char\[$(get_term_color nocolor)\] "
+ PS1="${PS1%"${PS1#*[wW]}"}$(__git_ps1 ' (%s)') \[$ps_color\]$ps_char\[$(get_term_color nocolor)\] "
}
PROMPT_COMMAND=prompt_command
fi
iankelling.org / git / distro-setup / blobdiff