bash_profile: The whitespace fixes broke __mdw_conf -- unbreak it.

[profile] / bash_profile

diff --git a/bash_profile b/bash_profile
index 198aeeb..1f0306c 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
@@ -97,13 +98,6 @@ export NAME="Mark Wooding"
 export EMAIL=`__mdw_conf email`
 export QMAILINJECT=c
 
-# --- GIT environment things ---
-
-export GIT_AUTHOR_NAME=$NAME
-export GIT_AUTHOR_EMAIL=$EMAIL
-export GIT_COMMITTER_NAME=$NAME
-export GIT_COMMITTER_EMAIL=$EMAIL
-
 # --- Various options for programs ---
 
 umask 002
@@ -150,7 +144,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 +164,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 +191,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.