diff rc/bash @ 279:33d0cb669e1f

Merge.
author Edho Arief <edho@myconan.net>
date Thu, 08 Dec 2011 19:12:53 +0700
parents 53bbc9673f87 8e451b27baa5
children 758dd58bb3cb 87ce8cfdb8d4
line wrap: on
line diff
--- a/rc/bash	Thu Dec 08 19:11:57 2011 +0700
+++ b/rc/bash	Thu Dec 08 19:12:53 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
 
@@ -74,13 +74,19 @@
       _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"
     if command -v gls > /dev/null 2>&1; then
       _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)
@@ -89,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*)
@@ -137,6 +143,13 @@
   fi
 done
 
+for supbindir in {"${HOME}/app","/opt"}/supervisor{,d}/bin; do
+  if [ -d "${supbindir}" ]; then
+    PATH="${PATH}:${supbindir}"
+    break
+  fi
+done
+
 case "${TERM}" in
   xterm*|screen*|dtterm*)
     PROMPT_COMMAND='echo -ne "\033]0;'"${USER:-$LOGNAME}@$(uname -n)"': ${PWD}\007";'"${PROMPT_COMMAND}"