~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot-emacs: Make `trap' report the erroneous code.
[profile]
/
bash_profile
diff --git
a/bash_profile
b/bash_profile
index
4656cbe
..
bc812d6
100644
(file)
--- a/
bash_profile
+++ b/
bash_profile
@@
-29,9
+29,9
@@
__mdw_addto () {
[ -d $i ] || continue
case "X$val" in
X)
[ -d $i ] || continue
case "X$val" in
X)
-
val=$i
-
continue
-
;;
+ val=$i
+ continue
+ ;;
X$i)
continue
;;
X$i)
continue
;;
@@
-59,7
+59,7
@@
__mdw_addto () {
__mdw_conf () {
local var=$1
val=`sed -n "
__mdw_conf () {
local var=$1
val=`sed -n "
- /^[ ]*$var[ ]*=[ ]*\(\|.*[^ ]\)[ ]*$/ {
+ /^[
]*$var[ ]*=[ ]*\(\|.*[^ ]\)[ ]*$/ {
s//\1/; p; q
}
" ${MDWCONF-$HOME/.mdw.conf}`
s//\1/; p; q
}
" ${MDWCONF-$HOME/.mdw.conf}`
@@
-80,6
+80,10
@@
if [ -d /usr/local/plan9 ]; then
$PLAN9/bin
fi
$PLAN9/bin
fi
+# --- Find whether a program exists ---
+
+__mdw_programp () { type -t >/dev/null "$1"; }
+
# --- And the same for manual pages ---
case "$MACHTIME" in
# --- And the same for manual pages ---
case "$MACHTIME" in
@@
-98,12
+102,18
@@
export NAME="Mark Wooding"
export EMAIL=`__mdw_conf email`
export QMAILINJECT=c
export EMAIL=`__mdw_conf email`
export QMAILINJECT=c
-# --- GIT environment things ---
+# --- Find a text editor ---
+
+export MDW_EDITOR=ed
+for ed in mg "emacs21 -nw" "emacs -nw" vi pico nano ae; do
+ name=`echo $ed | sed 's/ .*$//'`
+ if __mdw_programp "$name"; then
+ MDW_EDITOR=$ed
+ break
+ fi
+done
-export GIT_AUTHOR_NAME=$NAME
-export GIT_AUTHOR_EMAIL=$EMAIL
-export GIT_COMMITTER_NAME=$NAME
-export GIT_COMMITTER_EMAIL=$EMAIL
+export EDITOR=mdw-editor VISUAL=mdw-editor
# --- Various options for programs ---
# --- Various options for programs ---
@@
-111,17
+121,9
@@
umask 002
[ -z "$HOST" ] && export HOST=`hostname`
[ -z "$HOST" ] && export HOST=`hostname`
-unset LANG
+unset LANG
LC_COLLATE
-export EDITOR=ed
-for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
- name=`echo $ed | sed 's/ .*$//'`
- if type -t >/dev/null "$name"; then
- EDITOR=$ed
- break
- fi
-done
-export VISUAL="$EDITOR"
+__mdw_programp distcc && export CCACHE_PREFIX=distcc
export TEXINPUTS=".:$HOME/lib/tex//:"
export TEXINPUTS=".:$HOME/lib/tex//:"
@@
-142,7
+144,7
@@
export SVNROOT=`__mdw_conf svn-root`
export BECOME="--preserve-environment"
export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
export BECOME="--preserve-environment"
export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
-export LESS="-iqgRh1"
+export LESS="-iqgRh1
FX
"
export LESSOPEN="|lesspipe.sh %s"
export LESSCHARSET=latin1
# export MAKEFLAGS="-j4"
export LESSOPEN="|lesspipe.sh %s"
export LESSCHARSET=latin1
# export MAKEFLAGS="-j4"
@@
-171,7
+173,7
@@
eval `start-ssh-agent -b`
if [ -z "$__mdw_bashrc" ] && [ "$__mdw_force_secure_session" = "yes" ] ||
( tty="`tty`" devtty="(/dev/)?${tty#/dev/}"
{ { { [ -e /etc/securetty ] && sectty=/etc/securetty; } ||
if [ -z "$__mdw_bashrc" ] && [ "$__mdw_force_secure_session" = "yes" ] ||
( tty="`tty`" devtty="(/dev/)?${tty#/dev/}"
{ { { [ -e /etc/securetty ] && sectty=/etc/securetty; } ||
-
{ [ -e /etc/securettys ] && sectty=/etc/securettys; }; } &&
+ { [ -e /etc/securettys ] && sectty=/etc/securettys; }; } &&
egrep "$devtty" $sectty >/dev/null; } ||
{ [ -e /etc/default/login ] &&
egrep "^CONSOLE=$devtty" /etc/default/login >/dev/null; } ||
egrep "$devtty" $sectty >/dev/null; } ||
{ [ -e /etc/default/login ] &&
egrep "^CONSOLE=$devtty" /etc/default/login >/dev/null; } ||
@@
-198,6
+200,8
@@
if pixie --version >/dev/null 2>&1; then
fi
fi
fi
fi
+[ -f "$HOME/.profile-local" ] && . "$HOME/.profile-local"
+
# --- Now, if my .bashrc hasn't been run yet, run it ---
#
# Oh, don't do that if we don't have a terminal.
# --- Now, if my .bashrc hasn't been run yet, run it ---
#
# Oh, don't do that if we don't have a terminal.