xinitrc: Support Emacs 22.

[profile] / bash_profile

diff --git a/bash_profile b/bash_profile
index 198aeeb..86e07b1 100644 (file)
--- a/bash_profile
+++ b/bash_profile
@@ -1,3 +1,4 @@
+# -*-sh-*-
 #
 # $Id: .profile,v 1.3 1997/01/09 20:30:23 mdw Exp $
 #
@@ -28,9 +29,9 @@ __mdw_addto () {
     [ -d $i ] || continue
     case "X$val" in
       X)
-        val=$i
-        continue
-        ;;
+       val=$i
+       continue
+       ;;
       X$i)
        continue
        ;;
@@ -58,7 +59,7 @@ __mdw_addto () {
 __mdw_conf () {
   local var=$1
   val=`sed -n "
-    /^[        ]*$var[         ]*=[    ]*\(\|.*[^      ]\)[    ]*$/ {
+    /^[         ]*$var[         ]*=[    ]*\(\|.*[^      ]\)[    ]*$/ {
       s//\1/; p; q
     }
   " ${MDWCONF-$HOME/.mdw.conf}`
@@ -71,7 +72,7 @@ __mdw_conf () {
 __mdw_addto PATH l \
   $HOME/bin \
   {,/usr{,/local}{,/X11R6}}{/bin,/sbin,/games} \
-  /opt/nfast{/bin,/sbin} \
+  /opt/nfast{,/gcc}{/bin,/sbin} \
   $HOME/src/ncipher/scripts
 if [ -d /usr/local/plan9 ]; then
   export PLAN9=/usr/local/plan9
@@ -79,6 +80,10 @@ if [ -d /usr/local/plan9 ]; then
     $PLAN9/bin
 fi
 
+# --- Find whether a program exists ---
+
+__mdw_programp () { type -t >/dev/null "$1"; }
+
 # --- And the same for manual pages ---
 
 case "$MACHTIME" in
@@ -97,12 +102,18 @@ export NAME="Mark Wooding"
 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 ---
 
@@ -110,17 +121,9 @@ umask 002
 
 [ -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//:"
 
@@ -141,7 +144,7 @@ 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
 # export MAKEFLAGS="-j4"
@@ -150,7 +153,7 @@ export TMP=$TMPDIR
 export PERL_READLINE_NOWARN=yes
 
 [ -z "$NNTPSERVER" ] && export NNTPSERVER=`__mdw_conf nntp-server`
-[ -z "$http_proxy" ] && export http_proxy=`__mdw_conf http-proxy`
+[ -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"
@@ -170,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; } ||
-         { [ -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; } ||
@@ -197,6 +200,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.