vapier 15/02/24 20:58:46 Added: bash-4.3-declare-visibility.patch bashrc-r2 Log: Do window title setup through PS1 #223641 by [email protected]. Add history -a to PROMPT_COMMAND #517342 by Paweł Hajdan, Jr.. Add fix from upstream for variable declare weirdness. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.1 app-shells/bash/files/bash-4.3-declare-visibility.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-4.3-declare-visibility.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-4.3-declare-visibility.patch?rev=1.1&content-type=text/plain Index: bash-4.3-declare-visibility.patch =================================================================== http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00075.html assign_array_var_from_word_list: after assignment, mark variable as no longer invisible assign_array_var_from_string: after assignment, mark variable as no longer invisible diff --git a/arrayfunc.c b/arrayfunc.c index c2ea0e5..6dab71c 100644 --- a/arrayfunc.c +++ b/arrayfunc.c @@ -407,6 +407,9 @@ assign_array_var_from_word_list (var, list, flags) (*var->assign_func) (var, l->word->word, i, 0); else array_insert (a, i, l->word->word); + + VUNSETATTR (var, att_invisible); /* no longer invisible */ + return var; } @@ -639,6 +642,10 @@ assign_array_var_from_string (var, value, flags) if (nlist) dispose_words (nlist); + + if (var) + VUNSETATTR (var, att_invisible); /* no longer invisible */ + return (var); } bind_int_variable: make sure `v' is non-null before making it visible diff --git a/variables.c b/variables.c index 2f07ebb..cbe7806 100644 --- a/variables.c +++ b/variables.c @@ -2872,10 +2872,12 @@ bind_int_variable (lhs, rhs) #endif v = bind_variable (lhs, rhs, 0); - if (v && isint) - VSETATTR (v, att_integer); - - VUNSETATTR (v, att_invisible); + if (v) + { + if (isint) + VSETATTR (v, att_integer); + VUNSETATTR (v, att_invisible); + } return (v); } -- 2.3.0 1.1 app-shells/bash/files/bashrc-r2 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bashrc-r2?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bashrc-r2?rev=1.1&content-type=text/plain Index: bashrc-r2 =================================================================== # /etc/bash/bashrc # # This file is sourced by all *interactive* bash shells on startup, # including some apparently interactive shells such as scp and rcp # that can't tolerate any output. So make sure this doesn't display # anything or bad things will happen ! # Test for an interactive shell. There is no need to set anything # past this point for scp and rcp, and it's important to refrain from # outputting anything in those cases. if [[ $- != *i* ]] ; then # Shell is non-interactive. Be done now! return fi # Bash won't get SIGWINCH if another process is in the foreground. # Enable checkwinsize so that bash will check the terminal size when # it regains control. #65623 # http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) shopt -s checkwinsize # Disable completion when the input buffer is empty. i.e. Hitting tab # and waiting a long time for bash to expand all of $PATH. shopt -s no_empty_cmd_completion # Enable history appending instead of overwriting when exiting. #139609 shopt -s histappend # Save each command to the history file as it's executed. #517342 # This does mean sessions get interleaved when reading later on, but this # way the history is always up to date. History is not synced across live # sessions though; that is what `history -n` does. PROMPT_COMMAND='history -a' # Change the window title of X terminals case ${TERM} in xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) PS1='\[\033]0;\u@\h:\w\007\]' ;; screen*) PS1='\[\033k\u@\h:\w\033\\\]' ;; *) unset PS1 ;; esac use_color=false #BSD#@# BSD doesn't typically come with dircolors so we need #BSD#@# to hardcode some terminals in here. #BSD#@case ${TERM} in #BSD#@ xterm*|rxvt*|Eterm|aterm|kterm|gnome*|screen|cons25) use_color=true;; #BSD#@esac # 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 ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" [[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</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 #BSD#@export CLICOLOR=1 #GNU#@alias ls='ls --color=auto' alias grep='grep --colour=auto' alias egrep='egrep --colour=auto' alias fgrep='fgrep --colour=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 for sh in /etc/bash/bashrc.d/* ; do [[ -r ${sh} ]] && source "${sh}" done # Try to keep environment pollution down, EPA loves us. unset use_color safe_term match_lhs sh
