Merge branch 'master' of vampire.distorted.org.uk:~mdw/public-git/profile

[profile] / dot / bash_profile

diff --git a/dot/bash_profile b/dot/bash_profile
index 764f6b3..d61a7c3 100644 (file)
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -2,9 +2,8 @@
 ###
 ### Bash startup things
 
-## Only do any of this if we haven't done it before.  Otherwise we
-## can have loops and lots of wasted time.
-if [ -z "$__mdw_profile" ]; then
+## The `.bashrc' hook will run us if it thinks we haven't been run before.
+## We should therefore let it know.
 export __mdw_profile=done
 
 ###--------------------------------------------------------------------------
@@ -69,7 +68,7 @@ cd $HOME
 ## The main path.
 __mdw_addto PATH l \
   $HOME/bin \
-  {,/usr{,/local}{,/X11R6}}{/bin,/sbin,/games} \
+  {/usr{/local,}{,/X11R6},}{/bin,/sbin,/games} \
   /opt/nfast{,/gcc}{/bin,/sbin} \
   $HOME/src/ncipher/scripts
 
@@ -182,6 +181,20 @@ export PERL_READLINE_NOWARN=yes
 ## If we have `distcc' then tell `ccache' to use it.
 __mdw_programp distcc && export CCACHE_PREFIX=distcc
 
+## Choose a sensible web browser.  If we have a display, try to pick a
+## graphical one.
+browsers="elinks w3m lynx"
+case "${DISPLAY+t}" in
+  t) browsers="mdw-chrome iceweasel firefox $browsers" ;;
+esac
+for i in $browsers; do
+  if __mdw_programp $i; then
+    export BROWSER=$i
+    break
+  fi
+done
+unset browsers
+
 ## Acquiring root privileges.  This is mainly the job of `bashrc', but we
 ## cache the mechanism here.
 export __MDW_ROOTLY=`mdw-conf rootly`
@@ -272,9 +285,6 @@ fi
 ## If there's a local hook then run it.
 [ -f "$HOME/.profile-local" ] && . "$HOME/.profile-local"
 
-## End of the `__mdw_profile' guard.
-fi
-
 ## If we haven't run the `.bashrc' yet, and this shell is interactive, then
 ## run it now.
 [ -z "$__mdw_bashrc" ] && [ -t 0 ] && \