From c12d330ddc951c5e6761c0535a4c5dd079d0a777 Mon Sep 17 00:00:00 2001 From: cvpcs Date: Sun, 6 Jun 2010 18:06:59 -0500 Subject: fixed some problems with bash --- etc/bashrc | 62 ++++++++++++++------------------------------------------------ 1 file changed, 14 insertions(+), 48 deletions(-) (limited to 'etc/bashrc') diff --git a/etc/bashrc b/etc/bashrc index a755c81..d12d076 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -23,18 +23,24 @@ shopt -s checkwinsize # Enable history appending instead of overwriting. #139609 shopt -s histappend -# Change the window title of X terminals -case ${TERM} in - screen) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"' - ;; -esac +use_color=false + +# set some environment variables +HOME=/sdcard +TERM=linux + +# enable colorful terminal +if [[ ${EUID} == 0 ]] ; then + PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' +else + PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' +fi # Set up a ton of aliases to cover toolbox with the nice busybox # equivalents of its commands alias cat='busybox cat' alias ln='busybox ln' -alias ls='busybox ls' +alias ls='busybox ls --color' alias mount='busybox mount' alias rm='busybox rm' alias umount='busybox umount' @@ -48,46 +54,6 @@ alias insmod='busybox insmod' alias rmmod='busybox rmmod' alias lsmod='busybox lsmod' -use_color=false - -# Set colorful PS1 only on colorful terminals. -# dircolors --print-database uses its own built-in database -# instead of using /etc/DIR_COLORS. Try to use the external file -# first to take advantage of user additions. Use internal bash -# globbing instead of external grep binary. -safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM -match_lhs="" -[[ -f /system/etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(/dev/null \ - && match_lhs=$(dircolors --print-database) -[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true - -if ${use_color} ; then - # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 - if type -P dircolors >/dev/null ; then - if [[ -f ~/.dir_colors ]] ; then - eval $(dircolors -b ~/.dir_colors) - elif [[ -f /etc/DIR_COLORS ]] ; then - eval $(dircolors -b /etc/DIR_COLORS) - fi - fi - - if [[ ${EUID} == 0 ]] ; then - PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' - else - PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' - fi - - alias ls='busybox ls --color=auto' -else - if [[ ${EUID} == 0 ]] ; then - # show root@ when we don't have colors - PS1='\u@\h \W \$ ' - else - PS1='\u@\h \w \$ ' - fi -fi - # Try to keep environment pollution down, EPA loves us. unset use_color safe_term match_lhs + -- cgit v1.1