bash_profile: Split check-for-program code into its own function.

[profile] / bash_profile

diff --git a/bash_profile b/bash_profile
index 8b236ee..287f3cb 100644 (file)
--- a/bash_profile
+++ b/bash_profile
@@ -29,9 +29,9 @@ __mdw_addto () {
     [ -d $i ] || continue
     case "X$val" in
       X)
-        val=$i
-        continue
-        ;;
+       val=$i
+       continue
+       ;;
       X$i)
        continue
        ;;
@@ -59,7 +59,7 @@ __mdw_addto () {
 __mdw_conf () {
   local var=$1
   val=`sed -n "
-    /^[        ]*$var[         ]*=[    ]*\(\|.*[^      ]\)[    ]*$/ {
+    /^[         ]*$var[         ]*=[    ]*\(\|.*[^      ]\)[    ]*$/ {
       s//\1/; p; q
     }
   " ${MDWCONF-$HOME/.mdw.conf}`
@@ -80,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
@@ -98,31 +102,26 @@ 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
-
-[ -z "$HOST" ] && export HOST=`hostname`
-
-unset LANG
+# --- Find a text editor ---
 
 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
+  if __mdw_programp "$name"; then
     EDITOR=$ed
     break
   fi
 done
 export VISUAL="$EDITOR"
 
+# --- Various options for programs ---
+
+umask 002
+
+[ -z "$HOST" ] && export HOST=`hostname`
+
+unset LANG LC_COLLATE
+
 export TEXINPUTS=".:$HOME/lib/tex//:"
 
 __mdw_addto INFOPATH r $HOME/info /usr/info /usr/share/info /usr/local/info
@@ -142,7 +141,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"
@@ -171,7 +170,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; } ||