--- a/rc/bash	Thu Dec 22 15:00:08 2011 +0700
+++ b/rc/bash	Thu Dec 22 15:00:25 2011 +0700
@@ -17,7 +17,7 @@
 export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 
 shopt -s histappend
-PROMPT_COMMAND='history -a'
+PROMPT_COMMAND="history -a"
 export HISTFILESIZE=10000
 export HISTCONTROL=ignoredups
 
@@ -69,6 +69,16 @@
       _has_gnu_grep=y
       _grep="ggrep"
     fi
+    if command -v gls > /dev/null 2>&1; then
+      _has_gnu_ls=y
+      _ls="gls"
+    fi
+  ;;
+  FreeBSD)
+    # Invalid characters when using en_US.UTF-8.
+    alias man="man -o"
+    # Multi CPU awesomeness.
+    alias top="top -P"
   ;;
   OpenBSD)
     PATH="${PATH}:/usr/X11R6/bin"
@@ -76,7 +86,7 @@
       _has_gnu_ls=y
       _ls="gls"
     elif command -v colorls > /dev/null 2>&1; then
-      alias ls='colorls -F'
+      alias ls="colorls -F"
     fi
   ;;
   NetBSD)
@@ -85,7 +95,7 @@
       _has_gnu_ls=y
       _ls="gls"
     elif command -v colorls > /dev/null 2>&1; then
-      alias ls='colorls -F'
+      alias ls="colorls -F"
     fi
   ;;
   CYGWIN*)
@@ -126,9 +136,18 @@
 
 # Mercurial is optional since it will be inconsistent with ssh ... hg if this one gets priority.
 # And use only one.
-for hgdir in {"${HOME}/app","/opt"}/mercurial; do
-  if [ -x "${hgdir}/hg" ]; then
+for hgdir in {"${HOME}/app","/opt"}/mercurial{,/bin}; do
+  hgbin="${hgdir}/hg"
+  if [ -x "${hgbin}" ]; then
     PATH="${PATH}:${hgdir}"
+    alias nhg="${hgbin}"
+    break
+  fi
+done
+
+for supbindir in {"${HOME}/app","/opt"}/supervisor{,d}/bin; do
+  if [ -d "${supbindir}" ]; then
+    PATH="${PATH}:${supbindir}"
     break
   fi
 done