config: .bashrc annotate

annotate .bashrc @ 748:b68cd77be145

remove linux-specific

author	Jeff Hammel <k0scist@gmail.com>
date	Tue, 30 Jun 2015 15:19:56 -0700
parents	e12ca24fd7c6
children	f7b939206baf

rev	line source
334 5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	1 #!/bin/bash
379 61a3c07e9f7a kill reject files Jeff Hammel <jhammel@mozilla.com> parents: 349 diff changeset	2
334 5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	3 ### bash rc file ###
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	4
379 61a3c07e9f7a kill reject files Jeff Hammel <jhammel@mozilla.com> parents: 349 diff changeset	5 # source the profile, if it exists
332 d0f91aad5f84 better Jeff Hammel <jhammel@mozilla.com> parents: 331 diff changeset	6 PROFILE=/etc/profile
d0f91aad5f84 better Jeff Hammel <jhammel@mozilla.com> parents: 331 diff changeset	7 if [ -e "${PROFILE}" ]
d0f91aad5f84 better Jeff Hammel <jhammel@mozilla.com> parents: 331 diff changeset	8 then
d0f91aad5f84 better Jeff Hammel <jhammel@mozilla.com> parents: 331 diff changeset	9 . "${PROFILE}"
d0f91aad5f84 better Jeff Hammel <jhammel@mozilla.com> parents: 331 diff changeset	10 fi
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	11
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	12 # Test for an interactive shell. There is no need to set anything
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	13 # past this point for scp and rcp, and it's important to refrain from
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	14 # outputting anything in those cases.
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	15 if [[ $- != i ]] ; then
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	16 # Shell is non-interactive. Be done now!
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	17 return
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	18 fi
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	19
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	20 # Enable colors for ls, etc. Prefer ~/.dir_colors #64489
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	21 if [[ -f ~/.dir_colors ]] ; then
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	22 eval $(dircolors -b ~/.dir_colors)
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	23 elif [[ -f /etc/DIR_COLORS ]] ; then
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	24 eval $(dircolors -b /etc/DIR_COLORS)
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	25 fi
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	26
67 a791d862148c add a default MOZCONFIG variable -- BE CAREFUL! Jeff Hammel <jhammel@mozilla.com> parents: 66 diff changeset	27 # variables
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	28 export BROWSER=$(which firefox)
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	29 export CLICOLOR=1
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	30 export EDITOR='emacs -nw'
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	31 export JS_EDITLINE=1
510 44f9b67bb56f mozconf Jeff Hammel <jhammel@mozilla.com> parents: 507 diff changeset	32 export JS_EDITLINE=1
44f9b67bb56f mozconf Jeff Hammel <jhammel@mozilla.com> parents: 507 diff changeset	33
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	34 # aliases
564 047a53a8fbad py3 Jeff Hammel <jhammel@mozilla.com> parents: 563 diff changeset	35 alias awd="python -c 'import os; print (os.path.realpath(\".\"))'"
514 1303f1f90a90 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 510 diff changeset	36 alias currentpatch='echo `hg root`/.hg/patches/`hg qapp -v \| tail -n 1 \| cut -f 3 -d " "`'
246 d9b8d176c449 add a thing to get the full path to current patch and start organizing aliases Jeff Hammel <jhammel@mozilla.com> parents: 241 diff changeset	37 alias datestamp='date +%Y%m%d%H%M%S'
705 9afe2373aaa2 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 697 diff changeset	38 alias envkeys='env \| sed "s/=.*//" \| sort'
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	39 alias grep='grep --colour=auto'
736 0dd3144d3bdc loop videos Jeff Hammel <k0scist@gmail.com> parents: 715 diff changeset	40 alias loopmplayer='mplayer -fixed-vo -loop 0 -fs'
0dd3144d3bdc loop videos Jeff Hammel <k0scist@gmail.com> parents: 715 diff changeset	41 alias loopxine='xine -f -g -l'
696 3fb348ed57a9 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 695 diff changeset	42 alias lsenv='env \| sort \| less'
697 6b0b422d7226 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 696 diff changeset	43 alias mslower='mplayer -osd-fractions 1 -speed 0.1 -osdlevel 3'
379 61a3c07e9f7a kill reject files Jeff Hammel <jhammel@mozilla.com> parents: 349 diff changeset	44 alias patch='patch --reject-file=-'
564 047a53a8fbad py3 Jeff Hammel <jhammel@mozilla.com> parents: 563 diff changeset	45 alias random="python -c 'import sys, random; foo = sys.argv[1:]; random.shuffle(foo); print (\" \".join(foo)')"
314 11a349035020 add weekstamp Jeff Hammel <jhammel@mozilla.com> parents: 310 diff changeset	46 alias weekstamp="date --date=\"$((`date '+%u'`-1)) days ago\" '+%b %d'"
250 6f3d12f17847 order aliases Jeff Hammel <jhammel@mozilla.com> parents: 246 diff changeset	47 alias wget='wget --no-check-certificate'
535 2c1543b5c78f .bashrc .bashttw Jeff Hammel <jhammel@mozilla.com> parents: 534 diff changeset	48 if [ -e ~/.bashttw ]
2c1543b5c78f .bashrc .bashttw Jeff Hammel <jhammel@mozilla.com> parents: 534 diff changeset	49 then
2c1543b5c78f .bashrc .bashttw Jeff Hammel <jhammel@mozilla.com> parents: 534 diff changeset	50 . ~/.bashttw
2c1543b5c78f .bashrc .bashttw Jeff Hammel <jhammel@mozilla.com> parents: 534 diff changeset	51 fi
241 bed50e028005 front-end for releng bug Jeff Hammel <jhammel@mozilla.com> parents: 240 diff changeset	52
548 6b2c56da7c9d .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 546 diff changeset	53 # notification: from
6b2c56da7c9d .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 546 diff changeset	54 # http://www.netinfinity.org/2013/02/4/bits-and-pieces-ubuntu-terminal-notification.html
6b2c56da7c9d .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 546 diff changeset	55 alias alert_helper='history\|tail -n1\|sed -e "s/^\s[0-9]\+\s//" -e "s/;\s*alert$//"'
6b2c56da7c9d .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 546 diff changeset	56 alias alert='notify-send -i /usr/share/icons/gnome/32x32/apps/gnome-terminal.png "[$?] $(alert_helper)"'
6b2c56da7c9d .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 546 diff changeset	57
6b2c56da7c9d .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 546 diff changeset	58
66 91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	59 # PROMPT
119 dc3c8f90a418 * a new prompt! Jeff Hammel <jhammel@mozilla.com> parents: 111 diff changeset	60 PS1='│'
dc3c8f90a418 * a new prompt! Jeff Hammel <jhammel@mozilla.com> parents: 111 diff changeset	61 PS2='.'
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	62 PROMPT_COMMAND='echo -ne "\033]0;${SSH_CLIENT/*/$HOSTNAME:}${PWD/~/~}\007"'
657 60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	63 # Alt:
60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	64 ALTPS1='🎩 '
60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	65 ALTPS2='☰ '
60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	66 ALTPS2=' ҉ '
60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	67 altps() {
60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	68 export PS1=${ALTPS1}
60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	69 export PS2=${ALTPS2}
60952012be78 STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 651 diff changeset	70 }
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	71
66 91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	72 # PATHs
715 beb501ba919f minor cleanup Jeff Hammel <k0scist@gmail.com> parents: 714 diff changeset	73 export PATH=~/firefox:~/bin:~/bin/mozilla:~/python:$PATH:/usr/sbin:/usr/games/bin:~/virtualenv:~/silvermirror/bin:~/smartopen/bin:~/k0s/bin:~/docs/project/ims/workflow:~/cognet/bin:~/cognet/python
169 ab2fc6222f94 add virtualenv to the PYTHONPATH Jeff Hammel <jhammel@mozilla.com> parents: 167 diff changeset	74 export PYTHONPATH=~/python:$PYTHONPATH:~/virtualenv
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	75
84 7ddb611ba0c1 add update all command Jeff Hammel <jhammel@mozilla.com> parents: 76 diff changeset	76 ### functions
7ddb611ba0c1 add update all command Jeff Hammel <jhammel@mozilla.com> parents: 76 diff changeset	77
695 9d3b030696fa STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 657 diff changeset	78 gplot() {
9d3b030696fa STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 657 diff changeset	79
9d3b030696fa STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 657 diff changeset	80 gnuplot -persist <(echo plot '"'$1'"')
9d3b030696fa STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 657 diff changeset	81 }
9d3b030696fa STUB: .bashrc Jeff Hammel <k0scist@gmail.com> parents: 657 diff changeset	82
349 8161806daa20 hgrc Jeff Hammel <jhammel@mozilla.com> parents: 340 diff changeset	83 lspath() {
564 047a53a8fbad py3 Jeff Hammel <jhammel@mozilla.com> parents: 563 diff changeset	84 python -c 'import os; print ("\n".join(os.environ["PATH"].split(os.path.pathsep)))'
349 8161806daa20 hgrc Jeff Hammel <jhammel@mozilla.com> parents: 340 diff changeset	85 }
8161806daa20 hgrc Jeff Hammel <jhammel@mozilla.com> parents: 340 diff changeset	86
305 fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	87 apply-patch() {
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	88 # apply a patch
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	89 # TODO:
331 133eb1ade1dd documentation Jeff Hammel <jhammel@mozilla.com> parents: 330 diff changeset	90 # - rewrite in python!
305 fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	91 # - extract this general pattern as a bash "decorator" like `lsdiff` in .bash_overrides
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	92 # - right now level=1; make this configurable (somehow)
331 133eb1ade1dd documentation Jeff Hammel <jhammel@mozilla.com> parents: 330 diff changeset	93
305 fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	94 if (( ! $# ))
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	95 then
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	96 echo "No patch supplied"
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	97 return 1
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	98 fi
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	99
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	100 for patch in $@
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	101 do
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	102 if expr "$1" : 'http[s]\?://.*' &> /dev/null
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	103 then
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	104 IS_URL="true"
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	105 else
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	106 IS__URL="false"
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	107 fi
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	108
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	109 if [[ ${IS_URL} == "true" ]]
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	110 then
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	111 if curl --location "${patch}" 2> /dev/null \| (command patch -p1 --dry-run &> /dev/null)
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	112 then
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	113 curl --location "${patch}" 2> /dev/null \| command patch -p1
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	114 continue
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	115 else
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	116 echo "curl --location ${patch} 2> /dev/null \| command patch -p1 --dry-run"
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	117 curl --location "${patch}" 2> /dev/null \| command patch -p1 --dry-run
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	118 return $?
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	119 fi
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	120 else
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	121 if patch -p1 --dry-run < ${patch}
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	122 then
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	123 patch -p1 < ${patch}
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	124 continue
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	125 else
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	126 echo "patch -p1 --dry-run < ${patch}"
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	127 patch -p1 --dry-run < ${patch}
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	128 return $?
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	129 fi
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	130 fi
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	131 done
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	132 }
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	133
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	134 cdwin() {
305 fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	135 # change directory to a window's location using its title,
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	136 # as that is set to the cwd by PS1 [?]
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	137 # TODO: ssh windows
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	138 DIR=$(xwininfo \| dictify.py xwininfo \| awk '{ print $NF }' \| sed 's/"//g')
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	139 DIR=${DIR/\~/$HOME}
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	140 cd $DIR
532 e1aa8835edb7 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 531 diff changeset	141 activate-nearest
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	142 }
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	143
66 91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	144 function colors() {
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	145
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	146 CLR_WHITE="\033[0;37m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	147 CLR_WHITEBOLD="\033[1;37m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	148 CLR_BLACK="\033[0;30m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	149 CLR_GRAY="\033[1;30m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	150 CLR_BLUE="\033[1;34m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	151 CLR_BLUEBOLD="\033[0;34m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	152 CLR_GREEN="\033[0;32m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	153 CLR_GREENBOLD="\033[1;32m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	154 CLR_CYAN="\033[0;36m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	155 CLR_CYANBOLD="\033[1;36m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	156 CLR_RED="\033[0;31m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	157 CLR_REDBOLD="\033[1;31m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	158 CLR_PURPLE="\033[0;35m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	159 CLR_PURPLEBOLD="\033[1;35m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	160 CLR_YELLOW="\033[0;33m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	161 CLR_YELLOWBOLD="\033[1;33m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	162 CLR_NOTHING="\033[0m"
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	163 }
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	164 colors
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	165
418 dad9f18da036 changes Jeff Hammel <jhammel@mozilla.com> parents: 415 diff changeset	166
534 6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	167 ### find functionality
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	168
303 266d6b337373 still doesnt work but what the fuck Jeff Hammel <jhammel@mozilla.com> parents: 296 diff changeset	169 EXCLUDES="(\.svn)\|(\.mo$)\|(\.po$)\|(\.pyc$)\|(\.hg$)\|(\.git$)"
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	170 ff() {
304 7ed290454f50 random cleanup but not much Jeff Hammel <jhammel@mozilla.com> parents: 303 diff changeset	171 # nice fast find function
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	172
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	173 if (( $# < 2 ))
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	174 then
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	175 FILENAME='*' # default -- look in all files
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	176 else
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	177 FILENAME=$2
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	178 fi
76 84ffa220796a kill all stderr from ff Jeff Hammel <jhammel@mozilla.com> parents: 71 diff changeset	179 CMD='command find -L $PWD -iname "${FILENAME}" -print0 2> /dev/null \| xargs -r0 grep -il "$1" 2> /dev/null \| egrep -v "${EXCLUDES}" 2> /dev/null'
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	180 # echo $CMD
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	181 eval $CMD
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	182
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	183 }
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	184
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	185 chainff() {
304 7ed290454f50 random cleanup but not much Jeff Hammel <jhammel@mozilla.com> parents: 303 diff changeset	186 # chained fast find
7ed290454f50 random cleanup but not much Jeff Hammel <jhammel@mozilla.com> parents: 303 diff changeset	187
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	188 if (( $# < 2 ))
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	189 then
304 7ed290454f50 random cleanup but not much Jeff Hammel <jhammel@mozilla.com> parents: 303 diff changeset	190 return 1 # bad invocation
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	191 fi
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	192
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	193 RESULTS=`ff "$2" "$1"`
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	194 shift 2
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	195
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	196 for i in $RESULTS
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	197 do
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	198 for arg in $@
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	199 do
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	200 if grep -il "$arg" "$i" &> /dev/null
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	201 then
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	202 touch /dev/null
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	203 else
260 eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	204 i=""
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	205 break
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	206 fi
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	207 done
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	208 if [ -n "$i" ]
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	209 then
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	210 echo $i
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	211 fi
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	212 done
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	213 }
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	214
304 7ed290454f50 random cleanup but not much Jeff Hammel <jhammel@mozilla.com> parents: 303 diff changeset	215
66 91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	216 cff () {
304 7ed290454f50 random cleanup but not much Jeff Hammel <jhammel@mozilla.com> parents: 303 diff changeset	217 # contextual fastfind
66 91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	218 if (( $# < 2 )); then
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	219 local FILENAME='*' # default -- look in all files
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	220 else
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	221 local FILENAME=$2
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	222 fi
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	223
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	224 for i in `ff "$1" "$FILENAME"`; do
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	225 echo -e "$CLR_GREEN--->>> ""$CLR_YELLOWBOLD""$i""$CLR_NOTHING" :
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	226 grep --color=auto -i -n -C 3 "$1" $i
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	227 done
91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	228
260 eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	229 }
66 91746c8abe0f cleanup .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 47 diff changeset	230
539 1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	231 ### functions for files
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	232
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	233 tmpfile() {
305 fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	234 # make a temporary file if `tempfile` not available
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	235
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	236 if [ "$#" == "0" ]
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	237 then
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	238 args="tmp"
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	239 else
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	240 args=$@
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	241 fi
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	242
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	243 for i in $args
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	244 do
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	245 NEWNAME=${i}.$RANDOM
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	246
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	247 while [ -e $NEWNAME ]
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	248 do
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	249 NEWNAME=${NEWNAME}.tmp
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	250 done
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	251 echo "$NEWNAME"
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	252 done
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	253 }
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	254
565 7b70e5c0d410 fn -> xclip Jeff Hammel <jhammel@mozilla.com> parents: 564 diff changeset	255 abspath() {
642 b52004eb7761 no more moz Jeff Hammel <k0scist@gmail.com> parents: 623 diff changeset	256 # print absolute path
565 7b70e5c0d410 fn -> xclip Jeff Hammel <jhammel@mozilla.com> parents: 564 diff changeset	257 python -c "import os; print (os.path.realpath('$*'))"
7b70e5c0d410 fn -> xclip Jeff Hammel <jhammel@mozilla.com> parents: 564 diff changeset	258 }
7b70e5c0d410 fn -> xclip Jeff Hammel <jhammel@mozilla.com> parents: 564 diff changeset	259
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	260 fn() {
565 7b70e5c0d410 fn -> xclip Jeff Hammel <jhammel@mozilla.com> parents: 564 diff changeset	261 # put full name on clipboard and echo it
7b70e5c0d410 fn -> xclip Jeff Hammel <jhammel@mozilla.com> parents: 564 diff changeset	262 python -c "import os; print (os.path.realpath('$*'))" \| xclip -i
7b70e5c0d410 fn -> xclip Jeff Hammel <jhammel@mozilla.com> parents: 564 diff changeset	263 xclip -o
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	264 }
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	265
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	266 swap() {
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	267 # swap two files
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	268 if [ "$#" != "2" ]
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	269 then
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	270 echo "Usage: $FUNCNAME <file1> <file2>"
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	271 return
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	272 fi
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	273 for i in "$1" "$2"
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	274 do
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	275 if [ ! -w "$i" ]
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	276 then
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	277 echo "$FUNCNAME: Can't move $i"
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	278 return 1
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	279 fi
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	280 done
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	281
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	282 NEWNAME=`basename $1`.$RANDOM
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	283 while [ -e $NEWNAME ]
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	284 do
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	285 NEWNAME=${NEWNAME}.tmp
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	286 echo "$NEWNAME"
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	287 done
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	288
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	289 mv "$1" "$NEWNAME"
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	290 mv "$2" "$1"
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	291 mv "$NEWNAME" "$2"
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	292 }
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	293
560 d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	294 verifyfiles() {
d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	295 # verify each line is an existing file
d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	296 while read line
d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	297 do
d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	298 test -e "${line}"
d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	299 echo $? $line
d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	300 done
d15ee034bdf1 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 555 diff changeset	301 }
539 1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	302
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	303 ### functions for editing
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	304
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	305 edpe() {
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	306 # edit and pipe the buffer to stdout
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	307 FILE=`tmpfile`
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	308 $EDITOR $FILE
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	309 cat $FILE
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	310 rm $FILE
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	311 }
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	312
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	313 eend() {
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	314 # edit the end of a file with emacs
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	315 FILE=$1
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	316 shift
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	317 emacs +`wc -l "$FILE"` $@
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	318 }
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	319
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	320 ###
1eaf74615f72 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 538 diff changeset	321
330 0da3813d76d0 add buffer function Jeff Hammel <jhammel@mozilla.com> parents: 317 diff changeset	322 buffer() {
0da3813d76d0 add buffer function Jeff Hammel <jhammel@mozilla.com> parents: 317 diff changeset	323 # temporary buffer with cat and /dev/null
0da3813d76d0 add buffer function Jeff Hammel <jhammel@mozilla.com> parents: 317 diff changeset	324 cat > /dev/null
0da3813d76d0 add buffer function Jeff Hammel <jhammel@mozilla.com> parents: 317 diff changeset	325 }
0da3813d76d0 add buffer function Jeff Hammel <jhammel@mozilla.com> parents: 317 diff changeset	326
309 6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	327 ### `which` commands
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	328
309 6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	329 realwhich() {
6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	330 # which -> real paths
6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	331 command which $@ \| while read line
6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	332 do
564 047a53a8fbad py3 Jeff Hammel <jhammel@mozilla.com> parents: 563 diff changeset	333 python -c "import os; print (os.path.realpath('${line}'))"
309 6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	334 done
6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	335 }
6095d439d1f2 new stuff! realwhich Jeff Hammel <jhammel@mozilla.com> parents: 305 diff changeset	336
310 a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	337 whview() {
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	338 # which view
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	339 less `realwhich $@`
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	340 }
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	341
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	342 whemacs() {
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	343 # which emacs
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	344 emacs -nw `realwhich $@`
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	345 }
a6cd6900419e whview and whemacs use realwhich Jeff Hammel <jhammel@mozilla.com> parents: 309 diff changeset	346
569 38fc390b4e5d STUB: .bashrc .hgrc Jeff Hammel <k0scist@gmail.com> parents: 565 diff changeset	347 lswhich() {
38fc390b4e5d STUB: .bashrc .hgrc Jeff Hammel <k0scist@gmail.com> parents: 565 diff changeset	348 # ls -l real which
38fc390b4e5d STUB: .bashrc .hgrc Jeff Hammel <k0scist@gmail.com> parents: 565 diff changeset	349 for i in "$@"
38fc390b4e5d STUB: .bashrc .hgrc Jeff Hammel <k0scist@gmail.com> parents: 565 diff changeset	350 do
38fc390b4e5d STUB: .bashrc .hgrc Jeff Hammel <k0scist@gmail.com> parents: 565 diff changeset	351 ls -l $(realwhich $i)
38fc390b4e5d STUB: .bashrc .hgrc Jeff Hammel <k0scist@gmail.com> parents: 565 diff changeset	352 done
38fc390b4e5d STUB: .bashrc .hgrc Jeff Hammel <k0scist@gmail.com> parents: 565 diff changeset	353 }
561 0d5cf87e5b7e alias -> function Jeff Hammel <jhammel@mozilla.com> parents: 560 diff changeset	354
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	355 ### functions for python
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	356
305 fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	357 pyfile() {
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	358 # python file path
564 047a53a8fbad py3 Jeff Hammel <jhammel@mozilla.com> parents: 563 diff changeset	359 python -c "import $1; print ($1.__file__)"
305 fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	360 }
fac01a1bcedf add an apply-patch function Jeff Hammel <jhammel@mozilla.com> parents: 304 diff changeset	361
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	362 setup-all() {
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	363 # setup all for development
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	364 # TODO: flowerbed?
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	365 for i in *
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	366 do
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	367 if [ -e "${i}/setup.py" ]
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	368 then
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	369 cd "${i}"
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	370 python setup.py develop
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	371 cd ..
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	372 fi
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	373 done
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	374 }
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	375
561 0d5cf87e5b7e alias -> function Jeff Hammel <jhammel@mozilla.com> parents: 560 diff changeset	376 distribute() {
642 b52004eb7761 no more moz Jeff Hammel <k0scist@gmail.com> parents: 623 diff changeset	377 # upload to pypi
561 0d5cf87e5b7e alias -> function Jeff Hammel <jhammel@mozilla.com> parents: 560 diff changeset	378 python setup.py egg_info -RDb "" sdist register upload develop
0d5cf87e5b7e alias -> function Jeff Hammel <jhammel@mozilla.com> parents: 560 diff changeset	379 }
0d5cf87e5b7e alias -> function Jeff Hammel <jhammel@mozilla.com> parents: 560 diff changeset	380
531 42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	381 nearest-venv() {
642 b52004eb7761 no more moz Jeff Hammel <k0scist@gmail.com> parents: 623 diff changeset	382 # find the nearest venv
531 42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	383 if [[ "$#" == "0" ]]
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	384 then
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	385 directory=$PWD
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	386 else
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	387 directory=$1
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	388 fi
564 047a53a8fbad py3 Jeff Hammel <jhammel@mozilla.com> parents: 563 diff changeset	389 directory=$(python -c "import os; print (os.path.abspath('${directory}'))")
531 42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	390
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	391 while [[ "${directory}" != "/" ]]
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	392 do
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	393 activate="${directory}/bin/activate"
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	394 if [ -e "${activate}" ]
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	395 then
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	396 echo ${directory}
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	397 return 0
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	398 fi
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	399
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	400 directory=$(dirname ${directory})
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	401
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	402 done
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	403 return 1
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	404 }
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	405
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	406 activate-nearest() {
642 b52004eb7761 no more moz Jeff Hammel <k0scist@gmail.com> parents: 623 diff changeset	407 # activate the nearest virtualenv
531 42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	408 nearest=$(nearest-venv)
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	409 activate=${nearest}/bin/activate
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	410 if [ -e "${activate}" ]
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	411 then
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	412 . ${activate}
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	413 fi
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	414 }
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	415
296 ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	416 recreate-venv() {
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	417 # recreate a virtualenv
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	418 VIRTUALENV="virtualenv.py"
334 5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	419 if ! which ${VIRTUALENV}
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	420 then
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	421 return 1
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	422 fi
651 66a7729aa049 fix this function Jeff Hammel <k0scist@gmail.com> parents: 649 diff changeset	423 VENV_PATH=$(which ${VIRTUALENV})
66a7729aa049 fix this function Jeff Hammel <k0scist@gmail.com> parents: 649 diff changeset	424 echo VENV_PATH=${VENV_PATH}
334 5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	425
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	426 # update virtualenv if possible
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	427 DIRNAME=$(dirname ${VENV_PATH})
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	428 if [ -d "${DIRNAME}/.git" ]
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	429 then
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	430 cd "${DIRNAME}"
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	431 git pull
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	432 cd --
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	433 fi
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	434
5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	435 # for each virtualenv given...
296 ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	436 for i in $@
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	437 do
651 66a7729aa049 fix this function Jeff Hammel <k0scist@gmail.com> parents: 649 diff changeset	438 OLD_PWD=${PWD}
66a7729aa049 fix this function Jeff Hammel <k0scist@gmail.com> parents: 649 diff changeset	439 echo "${i} : OLDPWD=${OLD_PWD}"
334 5b67dd5ce0ba update virtualenv before upgrading Jeff Hammel <jhammel@mozilla.com> parents: 332 diff changeset	440 # ...recreate it...
296 ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	441 ${VIRTUALENV} --clear "${i}"
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	442
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	443 SRCDIR="${i}"/src
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	444 if [ -d "${SRCDIR}" ]
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	445 then
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	446 . "${i}/bin/activate"
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	447 cd "${SRCDIR}"
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	448 for j in *
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	449 do
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	450 if [ -e "${j}"/setup.py ]
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	451 then
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	452 cd "${j}"
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	453 python setup.py develop
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	454 cd ..
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	455 fi
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	456 done
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	457 fi
651 66a7729aa049 fix this function Jeff Hammel <k0scist@gmail.com> parents: 649 diff changeset	458 echo "cd OLD_PWD=${OLD_PWD}"
66a7729aa049 fix this function Jeff Hammel <k0scist@gmail.com> parents: 649 diff changeset	459 cd ${OLD_PWD}
296 ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	460 done
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	461 }
ee3c1b65d6d1 random fixes Jeff Hammel <jhammel@mozilla.com> parents: 295 diff changeset	462
260 eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	463 ### functions for version control systems
eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	464
71 3d111401010f add a function to view the files in a diff Jeff Hammel <jhammel@mozilla.com> parents: 67 diff changeset	465 difffiles() {
534 6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	466 # which files are diffed; could use `lsdiff`
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	467 grep '^+++ ' $@ \| sed 's/+++ b\///'
71 3d111401010f add a function to view the files in a diff Jeff Hammel <jhammel@mozilla.com> parents: 67 diff changeset	468 }
3d111401010f add a function to view the files in a diff Jeff Hammel <jhammel@mozilla.com> parents: 67 diff changeset	469
534 6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	470 git-diff-master() {
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	471 # differences of a git repository with master
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	472 git diff $(git merge-base HEAD master)
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	473 }
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	474
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	475 git-diff-total() {
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	476 # diff of both added + modified files
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	477 combinediff <(git diff) <(git diff --cached)
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	478 }
6ee5d5cca949 .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 532 diff changeset	479
260 eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	480 hg-update-all() {
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	481 # update all hg repositories in the current directory
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	482 for i in *;
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	483 do
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	484 if [ -e $i/.hg ]
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	485 then
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	486 cd $i
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	487 hg pull
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	488 hg update
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	489 cd -
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	490 fi
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	491 done
84 7ddb611ba0c1 add update all command Jeff Hammel <jhammel@mozilla.com> parents: 76 diff changeset	492 }
7ddb611ba0c1 add update all command Jeff Hammel <jhammel@mozilla.com> parents: 76 diff changeset	493
110 bf567a0e8fef add a hg-qcommit that does the right thing Jeff Hammel <jhammel@mozilla.com> parents: 103 diff changeset	494 hg-qcommit() {
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	495 message=$1
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	496 hg qrefresh
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	497 if [ -z "${message}" ]
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	498 then
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	499 hg qcommit
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	500 else
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	501 hg qcommit -m "${message}"
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	502 fi
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	503 hgroot=$(hg root)
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	504 patches=${hgroot}/.hg/patches/
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	505 if [ -e ${patches}.hg ]
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	506 then
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	507 cd ${patches}
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	508 hg push
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	509 fi
e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	510 cd -
110 bf567a0e8fef add a hg-qcommit that does the right thing Jeff Hammel <jhammel@mozilla.com> parents: 103 diff changeset	511 }
bf567a0e8fef add a hg-qcommit that does the right thing Jeff Hammel <jhammel@mozilla.com> parents: 103 diff changeset	512
89 dfda4f7d4db4 add a command to generate those hgrc files i always need Jeff Hammel <jhammel@mozilla.com> parents: 88 diff changeset	513
260 eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	514 ### functions for web content
eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	515
eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	516 blog-file() {
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	517 echo "$HOME/web/blog/k0s/entries/public/$1"
260 eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	518 }
eacc4c5ed628 add an alias for mozbuild bugs and cleanup a bit Jeff Hammel <jhammel@mozilla.com> parents: 250 diff changeset	519
330 0da3813d76d0 add buffer function Jeff Hammel <jhammel@mozilla.com> parents: 317 diff changeset	520 ###
0da3813d76d0 add buffer function Jeff Hammel <jhammel@mozilla.com> parents: 317 diff changeset	521
648 c6d3bfb2a21c shortcut for ubuntu Jeff Hammel <k0scist@gmail.com> parents: 643 diff changeset	522 apt-upgrade() {
c6d3bfb2a21c shortcut for ubuntu Jeff Hammel <k0scist@gmail.com> parents: 643 diff changeset	523 sudo apt-get -y update
c6d3bfb2a21c shortcut for ubuntu Jeff Hammel <k0scist@gmail.com> parents: 643 diff changeset	524 sudo apt-get -y upgrade
c6d3bfb2a21c shortcut for ubuntu Jeff Hammel <k0scist@gmail.com> parents: 643 diff changeset	525 }
c6d3bfb2a21c shortcut for ubuntu Jeff Hammel <k0scist@gmail.com> parents: 643 diff changeset	526
101 8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	527 flatten() {
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	528 directory=$PWD
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	529 if [ "$#" == "1" ]
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	530 then
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	531 directory=$1
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	532 fi
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	533 cd $directory
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	534 unset find # don't use the alias
102 35d28c0a6ba3 fix find command Jeff Hammel <jhammel@mozilla.com> parents: 101 diff changeset	535 find . -name '*' -type f \| sed 's/.\///' \| while read line
101 8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	536 do
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	537 filename=$(echo $line \| sed 's/\//-/g')
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	538 mv "${line}" "${filename}"
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	539 done
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	540 for i in *
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	541 do
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	542 if [ -d $i ]
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	543 then
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	544 rm -rf "${i}"
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	545 fi
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	546 done
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	547 }
8b15a38ccd0f * fix vpns Jeff Hammel <jhammel@mozilla.com> parents: 90 diff changeset	548
103 e841c419199e add process command to get filehandles Jeff Hammel <jhammel@mozilla.com> parents: 102 diff changeset	549 filehandles() {
e841c419199e add process command to get filehandles Jeff Hammel <jhammel@mozilla.com> parents: 102 diff changeset	550 TMPFILE=$(tmpfile)
e841c419199e add process command to get filehandles Jeff Hammel <jhammel@mozilla.com> parents: 102 diff changeset	551 ps -e\|grep -v TTY\|awk {'print "echo -n \"Process: "$4"\tPID: "$1"\tNumber of FH: \"; lsof -p "$1"\|wc -l"'} > ${TMPFILE}
e841c419199e add process command to get filehandles Jeff Hammel <jhammel@mozilla.com> parents: 102 diff changeset	552 . ${TMPFILE} \| sort
e841c419199e add process command to get filehandles Jeff Hammel <jhammel@mozilla.com> parents: 102 diff changeset	553 rm ${TMPFILE}
e841c419199e add process command to get filehandles Jeff Hammel <jhammel@mozilla.com> parents: 102 diff changeset	554 }
e841c419199e add process command to get filehandles Jeff Hammel <jhammel@mozilla.com> parents: 102 diff changeset	555
167 842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	556 quotemail() {
642 b52004eb7761 no more moz Jeff Hammel <k0scist@gmail.com> parents: 623 diff changeset	557 # TODO: -> textshaper
167 842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	558 command='s/^/> /'
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	559 inplace=""
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	560 if [ "$#" == "2" ]
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	561 then
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	562 inplace="-i"
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	563 fi
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	564
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	565 sed ${inplace} "${command}" "$1"
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	566
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	567 }
842e1fca024a add a quotemail function for quoting mail Jeff Hammel <jhammel@mozilla.com> parents: 147 diff changeset	568
317 eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	569 rmktmp() {
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	570
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	571 TMPDIR=~/tmp
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	572 if [ -e ${TMPDIR} ]
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	573 then
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	574 rm -rf ${TMPDIR}
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	575 fi
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	576 mkdir ${TMPDIR}
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	577 cd ${TMPDIR}
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	578 pwd
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	579
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	580 }
eb9d0776226f include rmktmp function Jeff Hammel <jhammel@mozilla.com> parents: 316 diff changeset	581
546 b7b4767d12de .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 543 diff changeset	582 exists() {
b7b4767d12de .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 543 diff changeset	583 while read line; do echo ${line} : $(($(test "-e ${line}"\") )); done
b7b4767d12de .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 543 diff changeset	584 }
b7b4767d12de .bashrc Jeff Hammel <jhammel@mozilla.com> parents: 543 diff changeset	585
0 f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	586 ### include overrides for commands
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/ k0s <k0scist@gmail.com> parents: diff changeset	587 source ~/.bash_overrides
47 a0636527f809 regenerate fluxbox menus on shell Jeff Hammel <k0scist@gmail.com> parents: 19 diff changeset	588
742 e12ca24fd7c6 remove cruft Jeff Hammel <k0scist@gmail.com> parents: 736 diff changeset	589 ### deactivate any virtualenvs
531 42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	590 if type deactivate &> /dev/null
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	591 then
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	592 deactivate
42d3418e9154 .bashrc bin/setup-X.sh Jeff Hammel <jhammel@mozilla.com> parents: 529 diff changeset	593 fi
649 fbfc02ea7d8e make our menu generator slightly less vulgar Jeff Hammel <k0scist@gmail.com> parents: 648 diff changeset	594
fbfc02ea7d8e make our menu generator slightly less vulgar Jeff Hammel <k0scist@gmail.com> parents: 648 diff changeset	595 ### regenerate fluxbox menus here for convenience
47 a0636527f809 regenerate fluxbox menus on shell Jeff Hammel <k0scist@gmail.com> parents: 19 diff changeset	596 MENU=~/web/site/programs.html
237 b33d0c78132c move menu regeneration to its own function Jeff Hammel <jhammel@mozilla.com> parents: 224 diff changeset	597 regeneratefluxmenu() {
649 fbfc02ea7d8e make our menu generator slightly less vulgar Jeff Hammel <k0scist@gmail.com> parents: 648 diff changeset	598 if [ -e "${MENU}" ]
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	599 then
649 fbfc02ea7d8e make our menu generator slightly less vulgar Jeff Hammel <k0scist@gmail.com> parents: 648 diff changeset	600 html2flux.py "${MENU}" -o ~/.fluxbox/applications
295 e2564dd51334 slowly slowly, step by step... Jeff Hammel <jhammel@mozilla.com> parents: 279 diff changeset	601 fi
237 b33d0c78132c move menu regeneration to its own function Jeff Hammel <jhammel@mozilla.com> parents: 224 diff changeset	602 }
b33d0c78132c move menu regeneration to its own function Jeff Hammel <jhammel@mozilla.com> parents: 224 diff changeset	603 regeneratefluxmenu

Mercurial > hg > config

annotate .bashrc @ 748:b68cd77be145