#exec 2>/a/tmp/bashlog
-# 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
-
+# By default this file is sourced for ALL ssh commands. This is wonky.
+# Normally, this file is not sourced when a script is run, but we can override
+# that by having #!/bin/bash -l.
+# I want something similar for ssh commands. when a local script runs an ssh command,
+# this file should not be sourced by default, but we should be able to override that.
+#
+# so here we test for conditions of a script under ssh and return if so. To test
+# for an overriding condition, we have a few options. one is to use an
+# environment variable. env variables sent across ssh are strictly limited. ssh
+# -t which sets $SSH_TTY, but within a script that won't work because tty
+# allocation will fail. We could override an obscure unused LC_var, like
+# telephone, but I don't want to run into some edge case where that messes
+# things up. we could transfer a file which we could test for, but I can't think
+# of a way to make that inherently limited to a single ssh command. I choose to
+# set SendEnv and AcceptEnv ssh config vars to allow the environment variable
+# BASH_LOGIN_SHELL to propagate across ssh.
+
+# assume we want ssh commands to source this file if we are sourcing it,
+# and we haven't specified otherwise already
+[[ ! $BASH_LOGIN_SHELL ]] && export BASH_LOGIN_SHELL=true
+
+# first conditions show that we are an ssh command without an interactive shell
if [[ $SSH_CONNECTION ]] \
- && [[ $- == *c* ]] \
- && [[ ! $SSH_TTY ]] \
- && [[ ! $BASH_LOGIN_SHELL == true ]] \
- && [[ $- != *i* ]]; then
+ && [[ $- == *c* ]] \
+ && [[ ! $SSH_TTY ]] \
+ && [[ $- != *i* ]] \
+ && [[ ! $BASH_LOGIN_SHELL == true ]]; then
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
+# now using xfce+xmonad instead of vanilla xmonad, so disabling this
+#unset GNOME_KEYRING_CONTROL
-#use extra globing features. See man bash, search extglob.
+# use extra globing features.
shopt -s extglob
-#include .files when globbing.
-shopt -s dotglob
+# include .files when globbing, but ignore files name . and ..
+# setting this also sets dotglob
+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
if [[ $INSIDE_EMACS ]]; then
+ # EMACS is used by bash on startup, but we don't need it anymore.
+ # plus I hit a bug in a makefile which inherited it
+ unset EMACS
export INSIDE_EMACS
export PAGER=cat
export MANPAGER=cat
- # for readline-complete.el
- stty echo
+ # scp completion does not work, but this doesn't fix it. todo, figure this out
+ complete -r scp &> /dev/null
+ # todo, remote file completion fails, figure out how to turn it off
fi
if [[ $- == *i* ]]; then
# for readline-complete.el
if [[ $INSIDE_EMACS ]]; then
+ # all for readline-complete.el
+ stty echo
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 ~/opt/distro-functions/src/*; do
+ source "$_x"
+done
+unset _x
+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
+source $HOME/mw_vars
+
###############
### aliases ###
###############
-if [[ $- == *i* ]]; then
- alias cp='cp -i'
- alias mv='mv -i'
-fi
+# disabled for now, but these are generally good
+# if [[ $- == *i* ]]; then
+# alias cp='cp -i'
+# alias mv='mv -i'
+# fi
# remove any default aliases for these
alias ls > /dev/null 2>&1 && unalias ls
else
s() {
if [[ $EUID != 0 || $1 == -* ]]; then
- local SUDOD="$PWD"
- sudo -i "$@"
+ SUDOD="$PWD" sudo -i "$@"
else
"$@"
fi
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//\//\\/}"
+}
+# portable daemon, for debian & fedora
+pdaemon () {
+ if isdeb; then
+ sudo /etc/init.d/$1 $2
+ else
+ sudo systemctl $2 $1.service
+ fi
+}
a() {
beet "${@}"
grep -ri --binary-files=without-match --color=auto "$@"
}
+pub() {
+ rsync -rhc /a/h/_site/ li:/var/www/iankelling.org/public_html
+}
+bashrcpush () {
+ local startdir="$PWD"
+ cd ~
+ for x in "$@"; do
+ ssh $x mkdir -p bin opt/distro-functions
+ tar cz bin/bash-programs-by-ian bin/semi-private opt/distro-functions/src | ssh $x tar xz
+ done
+ cd $(mktemp -d)
+ command cp /a/c/repos/bash/!(.git) ~/.gitconfig .
+ for x in "$@"; do
+ tar cz * | ssh $x tar xz
+ done
+ cd "$startdir"
+}
+# history search
+k() { grep -P "$@" ${HISTFILE:-~/.bash_history} | tail -n 40; }
calc() { echo "scale=3; $*" | bc -l; }
+# diff config files,
+# setup for format of postfix
+# option = stuff[,]
+# [more stuff]
+cdiff() {
+
+ local pastline
+ local unified="$(mktemp)"
+ local f1="$(mktemp)"
+ local f2="$(mktemp)"
+
+ _cdiff-prep "$1" "$f1"
+ _cdiff-prep "$2" "$f2"
+ cat "$f1" "$f2" | grep -Po '^[^=]+=' | sort | uniq > "$unified"
+ while IFS= read -r line; do
+ # the default bright red / blue doesn't work in emacs shell
+ dwdiff -cblue,red -A best -d " ," <(grep "^$line" "$f1" || echo ) <(grep "^$line" "$f2" || echo ) | colordiff
+ done < "$unified"
+}
+
+
+# join options which are continued to multiples lines onto one line
+_cdiff-prep() {
+ local first=true
+ grep -vE '^([ \t]*#|^[ \t]*$)' "$1" | while IFS= read -r line; do
+ # remove leading spaces/tabs. assumes extglob
+ if [[ $line == "[ ]*" ]]; then
+ line="${line##+( )}"
+ fi
+ if $first; then
+ pastline="$line"
+ first=false
+ elif [[ $line == *=* ]]; then
+ echo "$pastline" >> "$2"
+ pastline="$line"
+ else
+ pastline="$pastline $line"
+ fi
+ done
+ echo "$pastline" >> "$2"
+}
# makes it so chown -R symlink affects the symlink and its target.
chown() {
}
-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
}
+
+ff() {
+ if type -P firefox &>/dev/null; then
+ firefox "$@"
+ else
+ iceweasel "$@"
+ fi
+}
+
fw() {
firefox -P default "$@" >/dev/null 2>&1
}
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 "$@"
}
+
lld() { ll -d "$@"; }
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 -- "$@"
-}
-# package manager
-# aliases would be much more compact, but they can't be used as ssh commands
-# also, to be used in a script, you need -i which prints annoying
-# warnings. instead, use -l in a script to source this file
-if type -p yum > /dev/null; then
- p() {
- if [[ $EUID == 0 ]]; then
- yum "$@"
- else
- sudo yum "$@"
- fi
- }
- pi() {
- if [[ $EUID == 0 ]]; then
- yum -y install "$@"
- else
- sudo yum -y install "$@"
- fi
- }
- pf() {
- if [[ $EUID == 0 ]]; then
- yum search "$@"
- else
- sudo yum search "$@"
- fi
- }
-else
- p() {
- if [[ $EUID == 0 ]]; then
- aptitude "$@"
- else
- sudo aptitude "$@"
- fi
- }
- pi() {
- if [[ $EUID == 0 ]]; then
- aptitude -y install "$@"
- else
- sudo aptitude -y install "$@"
- 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 -F "%c%a%M %p %$((COLUMNS - 30))d" -w $COLUMNS search "$@"
- else
- sudo aptitude -F "%c%a%M %p %$((COLUMNS - 30))d" -w $COLUMNS search "$@"
- fi
- }
-fi
-
# test existence / exists
te() {
return $ret
}
+# show make targets, via http://stackoverflow.com/questions/3063507/list-goals-targets-in-gnu-make
+make-targets() {
+ make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}'
+}
+
# fix root file ownership for FILE argument.
# check if parent or grandparent is not root and if the dir of FILE is also
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
fi
}
+# see notes for usage
+fsdiff () {
+ local missing=false
+ local dname="${PWD##*/}"
+ local m="/a/tmp/$dname-missing"
+ local d="/a/tmp/$dname-diff"
+ [[ -e $d ]] && rm "$d"
+ [[ -e $m ]] && rm "$m"
+ local msize=0
+ local fsfile
+ while read -r line; do
+ fsfile="$1${line#.}"
+ if [[ -e "$fsfile" ]]; then
+ md5diff "$line" "$fsfile" && tee -a "/a/tmp/$dname-diff" <<< "$fsfile $line"
+ else
+ missing=true
+ echo "$line" >> "$m"
+ msize=$((msize + 1))
+ fi
+ done < <(find -type f )
+ if $missing; then
+ echo "$m"
+ (( msize <= 100 )) && cat $m
+ fi
+}
+
+fsdiff-test() {
+ cd $(mktemp -d)
+ echo ok > a
+ echo nok > b
+ mkdir c
+ echo ok > c/d
+ local x=$(mktemp -d)
+ mkdir $x/c
+ echo different > $x/c/d
+ echo ok > $x/a
+ fsdiff $x
+}
+# expected output, with different tmp dirs
+# /tmp/tmp.HDPbwMqdC9/c/d ./c/d
+# /a/tmp/tmp.qLDkYxBYPM-missing
+# ./b
+
+
+# test whether missing files were renamed, generally for use with fsdiff
+# $1 = fsdiff output file, $2 = directory to compare to. pwd = fsdiff dir
+# echos non-renamed files
+rename-test() {
+ local x y found
+ unset sums
+ for x in "$2"/*; do
+ { sums+=( "$(md5sum < "$x")" ) ; } 2>/dev/null
+ done
+ while read -r line; do
+ { missing_sum=$(md5sum < "$line") ; } 2>/dev/null
+ renamed=false
+ for x in "${sums[@]}"; do
+ if [[ $missing_sum == "$x" ]]; then
+ renamed=true
+ break
+ fi
+ done
+ $renamed || echo "$line"
+ done < "$1"
+ return 0
+}
+
+
+# get a random string
+#par2rbase=$(head -c 50 /dev/urandom | tr -cd '[:alpha:]')
+par2r() {
+ [[ $par2rbase ]] || { echo "set \$par2rbase first"; return 1; }
+ d="$PWD"
+ for x in **; do
+ if [[ -d $x ]]; then
+ cd "$x"
+ par2 c QDLDeDJ6z4.par2 *
+ cd "$d"
+ fi
+ done
+
+}
+
+md5diff() {
+ [[ $(md5sum < "$1") != $(md5sum < "$2") ]]
+}
+
+
pfind() { #find *$1* in $PATH
[[ $# != 1 ]] && { echo requires 1 argument; return 1; }
local pathArray
find "${pathArray[@]}" -iname "*$1*"
}
-
-pwd() { # do pwd + some other info.
- echo "$(ll -d "$PWD") $USER@$HOSTNAME $(date +%r)"
-}
+# do pwd + some other info.
+#pwd() { echo "$(ll -d "$PWD") $USER@$HOSTNAME $(date +%r)"; }
pwgen() { # generate a random password, with digits & punctuation and without
head -c 200 /dev/urandom | tr -cd '[:graph:]' | head -c "$arg"
echo
head -c 200 /dev/urandom | tr -cd '[:alnum:]' | head -c "$arg"
+ head -c 5 /dev/urandom | tr -cd '[:alpha:]' | head -c "$arg"
echo
}
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 ]] && (( $(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
# 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