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

* 'master' of git://git.distorted.org.uk/~mdw/profile:
  dot/bash_profile: Select a sensible web browser.

diff --git a/dot/bash_profile b/dot/bash_profile
index 7f372f2..27eec06 100644 (file)
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -182,6 +182,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`