Skip to content

Commit

Permalink
fixed some problems with bash
Browse files Browse the repository at this point in the history
  • Loading branch information
cvpcs committed Jun 6, 2010
1 parent 5999b91 commit c12d330
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 51 deletions.
17 changes: 15 additions & 2 deletions builtins/common.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -553,10 +553,23 @@ get_working_directory (for_whom)


if (the_current_working_directory == 0) if (the_current_working_directory == 0)
{ {
#if defined (GETCWD_BROKEN) #if defined (__BIONIC__)
the_current_working_directory = getcwd (0, PATH_MAX); /**
* This is a really lame work around to try to stop bash from flipping
* out if PWD isn't defined when starting it up on bionic
*/
char *d = (char *)malloc(sizeof(char) * PATH_MAX);
the_current_working_directory = getcwd (d, sizeof(d));
if (the_current_working_directory)
the_current_working_directory = d;
else
FREE (d);
#else #else
# if defined (GETCWD_BROKEN)
the_current_working_directory = getcwd (0, PATH_MAX);
# else
the_current_working_directory = getcwd (0, 0); the_current_working_directory = getcwd (0, 0);
# endif
#endif #endif
if (the_current_working_directory == 0) if (the_current_working_directory == 0)
{ {
Expand Down
62 changes: 14 additions & 48 deletions etc/bashrc
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,18 +23,24 @@ shopt -s checkwinsize
# Enable history appending instead of overwriting. #139609 # Enable history appending instead of overwriting. #139609
shopt -s histappend shopt -s histappend


# Change the window title of X terminals use_color=false
case ${TERM} in
screen) # set some environment variables
PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"' HOME=/sdcard
;; TERM=linux
esac
# 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 # Set up a ton of aliases to cover toolbox with the nice busybox
# equivalents of its commands # equivalents of its commands
alias cat='busybox cat' alias cat='busybox cat'
alias ln='busybox ln' alias ln='busybox ln'
alias ls='busybox ls' alias ls='busybox ls --color'
alias mount='busybox mount' alias mount='busybox mount'
alias rm='busybox rm' alias rm='busybox rm'
alias umount='busybox umount' alias umount='busybox umount'
Expand All @@ -48,46 +54,6 @@ alias insmod='busybox insmod'
alias rmmod='busybox rmmod' alias rmmod='busybox rmmod'
alias lsmod='busybox lsmod' 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}$(</system/etc/DIR_COLORS)"
[[ -z ${match_lhs} ]] \
&& type -P dircolors >/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. # Try to keep environment pollution down, EPA loves us.
unset use_color safe_term match_lhs unset use_color safe_term match_lhs

2 changes: 1 addition & 1 deletion variables.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ initialize_shell_variables (env, privmode)
set_auto_export (temp_var); /* XXX */ set_auto_export (temp_var); /* XXX */
#endif #endif


temp_var = set_if_not ("TERM", "dumb"); temp_var = set_if_not ("TERM", "unknown");
#if 0 #if 0
set_auto_export (temp_var); /* XXX */ set_auto_export (temp_var); /* XXX */
#endif #endif
Expand Down

0 comments on commit c12d330

Please sign in to comment.