Mercurial > ec-dotfiles
comparison 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 | 
   comparison
  equal
  deleted
  inserted
  replaced
| 272:53bbc9673f87 | 279:33d0cb669e1f | 
|---|---|
| 15 | 15 | 
| 16 _org_path="${PATH}" | 16 _org_path="${PATH}" | 
| 17 export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" | 17 export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" | 
| 18 | 18 | 
| 19 shopt -s histappend | 19 shopt -s histappend | 
| 20 PROMPT_COMMAND='history -a' | 20 PROMPT_COMMAND="history -a" | 
| 21 export HISTFILESIZE=10000 | 21 export HISTFILESIZE=10000 | 
| 22 export HISTCONTROL=ignoredups | 22 export HISTCONTROL=ignoredups | 
| 23 | 23 | 
| 24 export PAGER="less -Rins" | 24 export PAGER="less -Rins" | 
| 25 export EDITOR=vi | 25 export EDITOR=vi | 
| 72 if command -v gls > /dev/null 2>&1; then | 72 if command -v gls > /dev/null 2>&1; then | 
| 73 _has_gnu_ls=y | 73 _has_gnu_ls=y | 
| 74 _ls="gls" | 74 _ls="gls" | 
| 75 fi | 75 fi | 
| 76 ;; | 76 ;; | 
| 77 FreeBSD) | |
| 78 # Invalid characters when using en_US.UTF-8. | |
| 79 alias man="man -o" | |
| 80 # Multi CPU awesomeness. | |
| 81 alias top="top -P" | |
| 82 ;; | |
| 77 OpenBSD) | 83 OpenBSD) | 
| 78 PATH="${PATH}:/usr/X11R6/bin" | 84 PATH="${PATH}:/usr/X11R6/bin" | 
| 79 if command -v gls > /dev/null 2>&1; then | 85 if command -v gls > /dev/null 2>&1; then | 
| 80 _has_gnu_ls=y | 86 _has_gnu_ls=y | 
| 81 _ls="gls" | 87 _ls="gls" | 
| 82 elif command -v colorls > /dev/null 2>&1; then | 88 elif command -v colorls > /dev/null 2>&1; then | 
| 83 alias ls='colorls -F' | 89 alias ls="colorls -F" | 
| 84 fi | 90 fi | 
| 85 ;; | 91 ;; | 
| 86 NetBSD) | 92 NetBSD) | 
| 87 PATH="${PATH}:/usr/pkg/bin:/usr/pkg/sbin" | 93 PATH="${PATH}:/usr/pkg/bin:/usr/pkg/sbin" | 
| 88 if command -v gls > /dev/null 2>&1; then | 94 if command -v gls > /dev/null 2>&1; then | 
| 89 _has_gnu_ls=y | 95 _has_gnu_ls=y | 
| 90 _ls="gls" | 96 _ls="gls" | 
| 91 elif command -v colorls > /dev/null 2>&1; then | 97 elif command -v colorls > /dev/null 2>&1; then | 
| 92 alias ls='colorls -F' | 98 alias ls="colorls -F" | 
| 93 fi | 99 fi | 
| 94 ;; | 100 ;; | 
| 95 CYGWIN*) | 101 CYGWIN*) | 
| 96 export PATH="${PATH}:${_org_path}" | 102 export PATH="${PATH}:${_org_path}" | 
| 97 ;; | 103 ;; | 
| 135 PATH="${PATH}:${hgdir}" | 141 PATH="${PATH}:${hgdir}" | 
| 136 break | 142 break | 
| 137 fi | 143 fi | 
| 138 done | 144 done | 
| 139 | 145 | 
| 146 for supbindir in {"${HOME}/app","/opt"}/supervisor{,d}/bin; do | |
| 147 if [ -d "${supbindir}" ]; then | |
| 148 PATH="${PATH}:${supbindir}" | |
| 149 break | |
| 150 fi | |
| 151 done | |
| 152 | |
| 140 case "${TERM}" in | 153 case "${TERM}" in | 
| 141 xterm*|screen*|dtterm*) | 154 xterm*|screen*|dtterm*) | 
| 142 PROMPT_COMMAND='echo -ne "\033]0;'"${USER:-$LOGNAME}@$(uname -n)"': ${PWD}\007";'"${PROMPT_COMMAND}" | 155 PROMPT_COMMAND='echo -ne "\033]0;'"${USER:-$LOGNAME}@$(uname -n)"': ${PWD}\007";'"${PROMPT_COMMAND}" | 
| 143 PS1='[\[\e[0;33m\]\u\[\e[0m\]@\[\e[0;32m\]\h\[\e[0m\] \[\e[1;34m\]\W\[\e[0m\]]\$ ' | 156 PS1='[\[\e[0;33m\]\u\[\e[0m\]@\[\e[0;32m\]\h\[\e[0m\] \[\e[1;34m\]\W\[\e[0m\]]\$ ' | 
| 144 ;; | 157 ;; | 
