X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f617db13b0685c674817a6c7c1d148da3c07081f..6fc9ca849c1b9597c535885cc7c11a88c20ebd6f:/bash_profile diff --git a/bash_profile b/bash_profile index 02a40c8..f3e1d76 100644 --- a/bash_profile +++ b/bash_profile @@ -1,3 +1,4 @@ +# -*-sh-*- # # $Id: .profile,v 1.3 1997/01/09 20:30:23 mdw Exp $ # @@ -8,6 +9,15 @@ if [ -z "$__mdw_profile" ]; then export __mdw_profile=done +# --- Work out my home directory --- +# +# This horrible trick resolves symbolic links. It enables resolving links, +# changes directory and displays the name of the directory in a subshell +# to avoid changing the current state. + +HOME=`(set -P; cd $HOME; pwd)` +cd $HOME + # --- Add elements to a path string --- __mdw_addto () { @@ -19,9 +29,9 @@ __mdw_addto () { [ -d $i ] || continue case "X$val" in X) - val=$i - continue - ;; + val=$i + continue + ;; X$i) continue ;; @@ -44,24 +54,39 @@ __mdw_addto () { export $var=$val } -# --- What sort of machine am I running on? --- - -export arch=`echo $MACHTYPE | tr 'A-Z' 'a-z'` +# --- 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 \ + $HOME/bin \ {,/usr{,/local}{,/X11R6}}{/bin,/sbin,/games} \ - $HOME{,/arch/{$arch,any-any-any}}/bin \ - /opt/nfast{/bin,/sbin} \ + /opt/nfast{,/gcc}{/bin,/sbin} \ $HOME/src/ncipher/scripts -export PLAN9=/usr/local/plan9 -__mdw_addto PATH r \ - $PLAN9/bin +if [ -d /usr/local/plan9 ]; then + export PLAN9=/usr/local/plan9 + __mdw_addto PATH r \ + $PLAN9/bin +fi + +# --- Find whether a program exists --- + +__mdw_programp () { type -t >/dev/null "$1"; } # --- And the same for manual pages --- -case "$arch" in +case "$MACHTIME" in *linux*) MANPATH=`manpath -q` ;; @@ -70,28 +95,25 @@ __mdw_addto MANPATH l \ {/usr{,/local}{,/X11R6}{,/share}}/{man,catman} \ $HOME/man -# --- Work out my home directory --- -# -# This horrible trick resolves symbolic links. It enables resolving links, -# changes directory and displays the name of the directory in a subshell -# to avoid changing the current state. - -HOME=`(set -P; cd $HOME; pwd)` -cd $HOME - # --- Where my mail comes from --- -export MAIL=$HOME/Mailbox +export MAIL=`__mdw_conf mailbox` export NAME="Mark Wooding" -export EMAIL="mdw@distorted.org.uk" +export EMAIL=`__mdw_conf email` export QMAILINJECT=c -# --- GIT environment things --- +# --- Find a text editor --- + +export MDW_EDITOR=ed +for ed in mg "emacs22 -nw" "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 --- @@ -99,42 +121,49 @@ umask 002 [ -z "$HOST" ] && export HOST=`hostname` -export EDITOR="emacs -nw"; export VISUAL="$EDITOR" +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//:" __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 -[ -z "$LS_OPTIONS" ] && export LS_OPTIONS="-F" +export __MDW_ROOTLY=`__mdw_conf rootly` -export RMBKP="-abc +q -i" +[ -z "$LS_OPTIONS" ] && export LS_OPTIONS="-F" export BASCAT="-l +n" export CVS_RSH=ssh -case $HOST in - metalzone | metalzone.* ) - export CVSROOT="/home/cvs/cvs" - export SVNROOT="file:///home/cvs/svn" - ;; - *) - export CVSROOT="metalzone.distorted.org.uk:/home/cvs/cvs" - export SVNROOT="svn+ssh://metalzone.distorted.org.uk/home/cvs/svn" - ;; -esac +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="-iqgRh1" +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` +[ "$TMPDIR" ] || eval `tmpdir -b` export TMP=$TMPDIR export PERL_READLINE_NOWARN=yes -[ -z "$NNTPSERVER" ] && export NNTPSERVER=metalzone.distorted.org.uk -[ -z "$http_proxy" ] && export http_proxy="http://metalzone.distorted.org.uk:3128/" +[ -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" @@ -154,7 +183,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; } || - { [ -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; } || @@ -171,6 +200,7 @@ fi # --- And a passphrase pixie --- if pixie --version >/dev/null 2>&1; then + mkdir -p $HOME/.catacomb pixie=${CATACOMB_PIXIE-$HOME/.catacomb/pixie} if [ -S "$pixie" ] && pixie -C help >/dev/null 2>/dev/null; then : @@ -180,6 +210,8 @@ if pixie --version >/dev/null 2>&1; then 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.