~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'metalzone/master'
[profile]
/
bash_profile
diff --git
a/bash_profile
b/bash_profile
index
22931b0
..
af9021f
100644
(file)
--- a/
bash_profile
+++ b/
bash_profile
@@
-54,19
+54,6
@@
__mdw_addto () {
export $var=$val
}
export $var=$val
}
-# --- Find a configuration item ---
-
-__mdw_conf () {
- local var=$1
- val=`sed -n "
- /^[ ]*$var[ ]*=[ ]*\(\|.*[^ ]\)[ ]*$/ {
- s//\1/; p; q
- }
- " ${MDWCONF-$HOME/.mdw.conf}`
- case "$val" in "~"*) val=`eval "echo ${val%%/*}"`${val#\~};; esac
- echo "$val"
-}
-
# --- Set the path variable ---
__mdw_addto PATH l \
# --- Set the path variable ---
__mdw_addto PATH l \
@@
-80,6
+67,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
@@
-93,22
+84,29
@@
__mdw_addto MANPATH l \
# --- Where my mail comes from ---
# --- Where my mail comes from ---
-export MAIL=`
__mdw_
conf mailbox`
+export MAIL=`
mdw-
conf mailbox`
export NAME="Mark Wooding"
export NAME="Mark Wooding"
-export EMAIL=`
__mdw_
conf email`
+export EMAIL=`
mdw-
conf email`
export QMAILINJECT=c
# --- Find a text editor ---
export QMAILINJECT=c
# --- Find a text editor ---
-export EDITOR=ed
-for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
+export MDW_EDITOR=ed
+emacs_startup_args="--no-site-file --mdw-fast-startup -nw"
+for ed in \
+ "emacs22 $emacs_startup_args" \
+ "emacs21 $emacs_startup_args" \
+ mg \
+ "emacs -nw" \
+ vi pico nano ae; do
name=`echo $ed | sed 's/ .*$//'`
name=`echo $ed | sed 's/ .*$//'`
- if
type -t >/dev/null
"$name"; then
- EDITOR=$ed
+ if
__mdw_programp
"$name"; then
+
MDW_
EDITOR=$ed
break
fi
done
break
fi
done
-export VISUAL="$EDITOR"
+
+export EDITOR=mdw-editor VISUAL=mdw-editor
# --- Various options for programs ---
# --- Various options for programs ---
@@
-116,7
+114,15
@@
umask 002
[ -z "$HOST" ] && export HOST=`hostname`
[ -z "$HOST" ] && export HOST=`hostname`
-unset LANG LC_COLLATE
+if [ "$DISPLAY" = "" ]; then
+ : ${LC_CTYPE=${LANG-${LC_ALL-`mdw-conf console-ctype`}}}
+else
+ LC_CTYPE=`mdw-conf x-ctype`
+fi
+unset LANG LC_ALL LC_COLLATE
+export LC_CTYPE
+
+__mdw_programp distcc && export CCACHE_PREFIX=distcc
export TEXINPUTS=".:$HOME/lib/tex//:"
export TEXINPUTS=".:$HOME/lib/tex//:"
@@
-124,29
+130,33
@@
__mdw_addto INFOPATH r $HOME/info /usr/info /usr/share/info /usr/local/info
__mdw_addto PERLLIB r $HOME/lib/perl
__mdw_addto PYTHONPATH r $HOME/lib/python
__mdw_addto PERLLIB r $HOME/lib/perl
__mdw_addto PYTHONPATH r $HOME/lib/python
-export __MDW_ROOTLY=`
__mdw_
conf rootly`
+export __MDW_ROOTLY=`
mdw-
conf rootly`
[ -z "$LS_OPTIONS" ] && export LS_OPTIONS="-F"
export BASCAT="-l +n"
export CVS_RSH=ssh
[ -z "$LS_OPTIONS" ] && export LS_OPTIONS="-F"
export BASCAT="-l +n"
export CVS_RSH=ssh
-export CVSROOT=`
__mdw_
conf cvs-root`
-export SVNROOT=`
__mdw_
conf svn-root`
+export CVSROOT=`
mdw-
conf cvs-root`
+export SVNROOT=`
mdw-
conf svn-root`
export BECOME="--preserve-environment"
export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
export LESS="-iqgRh1FX"
export LESSOPEN="|lesspipe.sh %s"
export BECOME="--preserve-environment"
export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
export LESS="-iqgRh1FX"
export LESSOPEN="|lesspipe.sh %s"
-export LESSCHARSET=latin1
+case "$LC_CTYPE" in
+ *utf8*) LESSCHARSET=utf-8 ;;
+ *) LESSCHARSET=latin1 ;;
+esac
+export LESSCHARSET
# export MAKEFLAGS="-j4"
[ "$TMPDIR" ] || eval `tmpdir -b`
export TMP=$TMPDIR
export PERL_READLINE_NOWARN=yes
# export MAKEFLAGS="-j4"
[ "$TMPDIR" ] || eval `tmpdir -b`
export TMP=$TMPDIR
export PERL_READLINE_NOWARN=yes
-[ -z "$NNTPSERVER" ] && export NNTPSERVER=`
__mdw_
conf nntp-server`
-[ -z "$http_proxy" ] && export http_proxy=http://`
__mdw_
conf http-proxy`/
+[ -z "$NNTPSERVER" ] && export NNTPSERVER=`
mdw-
conf nntp-server`
+[ -z "$http_proxy" ] && export http_proxy=http://`
mdw-
conf http-proxy`/
[ -z "$ftp_proxy" ] && export ftp_proxy=$http_proxy
export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"
[ -z "$ftp_proxy" ] && export ftp_proxy=$http_proxy
export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"