return
fi
-# Side note on ssh.
-###################
-## include files ###
-###################
-
-for x in $HOME/bin/bash-programs-by-ian/repos/*/*-function; do
- source "$x"
-done
-
-source $HOME/bin/semi-private # so I can share my bashrc
-source $HOME/path_add-function
-
CDPATH=.:/a
+# 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
+
# remove gnome keyring warning messages
# 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 ..
+# this also sets dotglob, but no harm in setting it explicitly
+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 for a bug fix.
-# it's made it into distros now
-# usually this is sourced by the system already,
-# but I check just incase
+# 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
shopt -s checkwinsize
# attempt to save multiline single commands as single history entries.
shopt -s cmdhist
+shopt -s globstar
# inside emacs fixes
export MANPAGER=cat
# for readline-complete.el
stty echo
+ # todo, remote file completion fails, figure out how to turn it off
fi
if [[ $INSIDE_EMACS ]]; then
bind 'set horizontal-scroll-mode on'
bind 'set print-completions-horizontally on'
+ bind '"\C-i": self-insert'
else
# 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
HISTTIMEFORMAT="%I:%M %p %m/%d "
# 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
+# 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
+HISTIGNORE="k *"
export BC_LINE_LENGTH=0
-path_add /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
+###################
+## include files ###
+###################
+
+for x in $HOME/bin/bash-programs-by-ian/repos/*/*-function; do
+ source "$x"
+done
+source $HOME/bin/identify-distro-functions
+source $HOME/bin/semi-private # so I can share my bashrc
+source $HOME/path_add-function
+path_add --ifexists /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-tools
+path_add $HOME/bin/bash-programs-by-ian/utils
+
+
###############
### aliases ###
###############
fi
+
+
+
#####################
### functions ####
#####################
-
+# netselect-apt finds a fast mirror.
+# but we need to replace the mirrors ourselves,
+# because it doesn't do that. best it can do is
+# output a basic sources file
+# here we get the server it found, get the main server we use
+# then substitute all instances of one for the other in the sources file
+# and backup original to /etc/apt/sources.list-original.
+# this is idempotent
+debian_pick_mirror () {
+ local x=$(mktemp -d)/f # safe way to get file name without creating one
+ sudo netselect-apt -o "$x" || return 1
+ x=$(_debian_pick_mirror_grep stable "$x")
+ sudo cp -f /etc/apt/sources.list /etc/apt/sources.list-original
+ sudo sed -i "s/$(_debian_pick_mirror_grep wheezy)/$x/" /etc/apt/sources.list
+ aptitude update
+}
+
+_debian_pick_mirror_grep () {
+ local x="$(grep -oP "^deb [^ ]+ $1 " ${2-/etc/apt/sources.list})"
+ x="${x#deb }"
+ x="${x% $1 }"
+ # replace / with \/ so we can use it with sed
+ echo "${x//\//\\/}"
+}
a() {
beet "${@}"
grep -ri --binary-files=without-match --color=auto "$@"
}
+bashrcpush () {
+ local startdir="$PWD"
+ cd ~
+ for x in "$@"; do
+ ssh $x mkdir -p bin
+ tar cz bin/bash-programs-by-ian bin/semi-private .profile | ssh $x tar xz
+ done
+ cd $(mktemp -d)
+ cp ~/path_add-function ~/.bashrc ~/.bash_profile ~/.profile ~/.inputrc .
+ for x in "$@"; do
+ tar cz path_add-function .bashrc | ssh $x tar xz
+ done
+ cd "$startdir"
+}
-
+# history search
+k() { grep -P "$@" ${HISTFILE:-~/.bash_history} | tail -n 40; }
calc() { echo "scale=3; $*" | bc -l; }
}
-distro_name() {
- if [[ -f /etc/fedora-release ]]; then
- echo fedora
- else
- grep "^ID=.*" /etc/os-release | sed 's/^ID=//'
- fi
-}
-
-
dt() {
date "+%A, %B %d, %r" "$@"
}
[[ $# == 1 ]] || { echo 'need a branch name!'; return 1;}
local gitroot
gitroot || return 1 # function to set gitroot
- builtin cd $gitroot
+ builtin cd "$gitroot"
git symbolic-ref HEAD refs/heads/$1
rm .git/index
git clean -fdx
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 "$@"
done
}
-# force symbolic link creation.
-# trash-put any existing files where links would be created.
-# mkdir -p the directory containing the link(s) if needed.
-# then do ln -s -- "$@"
-lnf() {
- if [[ $# -gt 2 && ! -d ${!#} ]]; then
- mkdir -p "${!#}"
- fi
- if [[ $# -gt 1 && -d ${!#} ]]; then
- local oldcwd=$PWD
- cd ${!#} # last arg
- for x in "${@:1:$(($#-1))}"; do # all but last arg
- # remove any trailing slashes
- x="${x%%+(/)}"
- # remove any leading directory components
- x="${x##*/}"
- te "$x" && trash-put "$x"
- done
- cd "$oldcwd"
- elif [[ $# -eq 2 ]]; then
- if te "$2"; then
- trash-put "$2"
- elif [[ ! -d $(getdir "$2") ]]; then
- mkdir -p $(getdir "$2")
- fi
- else
- te "${1##*/}" && rm "${1##*/}"
- fi
- ln -s -- "$@"
-}
perm_fix() {
local parent
if [[ $EUID == 0 ]]; then
- te "$1" || touch $1
+ te "$1" || touch "$1"
if [[ $(stat -c "%u" "$1") == 0 ]] ; then
argdir=$(getdir "$1")
if [[ $(stat -c "%u" "$argdir") != 0 ]] ; then
# timer in minutes
tm() {
- (sleep $(calc "$@ * 60") && mpv /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
+ (sleep $(calc "$@ * 60") && mpv --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
}
fi
+
+
# todo, update this
complete -F _longopt la lower low rlt rld rl lld ts ll dircp ex fcp fct fpst gr
local max_lines linecount tempfile prune_lines
local harchive="${HISTFILE}_archive"
for x in "$HISTFILE" "$harchive"; do
- if [[ ! $x || ! -w $x || $(stat -c "%u" "$x") != $EUID ]]; then
- echo "error in hl: history file $x no good"
+ [[ -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
fi
}
-# commands to run when bash exits normally
-trap "hl; smh" EXIT
+if [[ $- == *i* ]]; then
+ # commands to run when bash exits normally
+ trap "hl; smh" EXIT
+fi
# temporary variables to test colorization
fi
# this needs to come before next ps1 stuff
- if [[ $BASH_VERSION == [456789]* ]]; then
- shopt -s autocd
- shopt -s globstar
- shopt -s dirspell
- PS1='\w'
- if [[ $- == *i* ]] && [[ ! $INSIDE_EMACS ]]; then
- PROMPT_DIRTRIM=2
- bind -m vi-command B:shell-backward-word
- bind -m vi-command W:shell-forward-word
- fi
- else
- PS1='\W'
+ # this stuff needs bash 4, feb 2009,
+ # old enough to no longer condition on $BASH_VERSION anymore
+ shopt -s autocd
+ shopt -s dirspell
+ PS1='\w'
+ if [[ $- == *i* ]] && [[ ! $INSIDE_EMACS ]]; then
+ PROMPT_DIRTRIM=2
+ bind -m vi-command B:shell-backward-word
+ bind -m vi-command W:shell-forward-word
fi
if [[ $SSH_CLIENT ]]; then
unset IFS
history -a # save history
history -n # read any new history
- if [[ ! DESKTOP_SESSION == xmonad && $TERM == *(screen*|xterm*|rxvt*) ]]; then
+ if [[ ! $DESKTOP_SESSION == xmonad && $TERM == *(screen*|xterm*|rxvt*) ]]; then
# from the screen man page
if [[ $TERM == screen* ]]; then
local title_escape="\033]..2;"
fi
+
+
+
###########################################
# stuff that makes sense to be at the end #
###########################################
iankelling.org / git / distro-setup / blobdiff