diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | gentoo-bashrc-2013.0 | 80 | ||||
| -rw-r--r-- | gentoo-bashrc-2016.0 | 109 |
4 files changed, 118 insertions, 87 deletions
@@ -1,14 +1,16 @@ +# Generated by mksrcinfo v8 +# Sun Feb 28 17:07:08 UTC 2016 pkgbase = gentoo-bashrc pkgdesc = This is Gentoo's BASHRC file, which has very nice color schemes. - pkgver = 2013.0 + pkgver = 2016.0 pkgrel = 1 url = http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html install = gentoo-bashrc.install arch = any license = GPL optdepends = bash: Shell needed to make use of this package - source = gentoo-bashrc-2013.0 - md5sums = 3149b49f29fc9dceb660c4a87b40e8cf + source = gentoo-bashrc-2016.0 + md5sums = 38f9a4144ef4e437e1132ce57d3d77b2 pkgname = gentoo-bashrc @@ -1,20 +1,20 @@ # Maintainer: Miguel Revilla <yo@miguelrevilla.com> # Contributor: Jeremy Sands <cto@jeremysands.com> pkgname=gentoo-bashrc -pkgver=2013.0 +pkgver=2016.0 pkgrel=1 pkgdesc="This is Gentoo's BASHRC file, which has very nice color schemes." arch=('any') url="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" license=('GPL') optdepends=('bash: Shell needed to make use of this package') -source=('gentoo-bashrc-2013.0') -md5sums=('3149b49f29fc9dceb660c4a87b40e8cf') +source=("gentoo-bashrc-${pkgver}") +md5sums=('38f9a4144ef4e437e1132ce57d3d77b2') install=${pkgname}.install package() { - install -D -m755 gentoo-bashrc-2013.0 "${pkgdir}"/usr/share/gentoo-bashrc/bashrc + install -D -m755 gentoo-bashrc-${pkgver} "${pkgdir}/usr/share/gentoo-bashrc/bashrc" msg "IMPORTANT!!" msg "" diff --git a/gentoo-bashrc-2013.0 b/gentoo-bashrc-2013.0 deleted file mode 100644 index d46cd1eb2f5f..000000000000 --- a/gentoo-bashrc-2013.0 +++ /dev/null @@ -1,80 +0,0 @@ -# /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 - -# Enable history appending instead of overwriting. #139609 -shopt -s histappend - -# Change the window title of X terminals -case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"' - ;; - screen) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"' - ;; -esac - -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 ~/.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 - - alias ls='ls --color=auto' - alias grep='grep --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 - -# Try to keep environment pollution down, EPA loves us. -unset use_color safe_term match_lhs diff --git a/gentoo-bashrc-2016.0 b/gentoo-bashrc-2016.0 new file mode 100644 index 000000000000..2b52d4ca8ca8 --- /dev/null +++ b/gentoo-bashrc-2016.0 @@ -0,0 +1,109 @@ +# /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. +# Disabled by default due to concerns related to system recovery when $HOME +# is under duress, or lives somewhere flaky (like NFS). Constantly syncing +# the history will halt the shell prompt until it's finished. +#PROMPT_COMMAND='history -a' + +# Change the window title of X terminals +case ${TERM} in + [aEkx]term*|rxvt*|gnome*|konsole*|interix) + PS1='\[\033]0;\u@\h:\w\007\]' + ;; + screen*) + PS1='\[\033k\u@\h:\w\033\\\]' + ;; + *) + unset PS1 + ;; +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_color=false +if type -P dircolors >/dev/null ; then + # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 + LS_COLORS= + if [[ -f ~/.dir_colors ]] ; then + # If you have a custom file, chances are high that it's not the default. + used_default_dircolors="no" + eval "$(dircolors -b ~/.dir_colors)" + elif [[ -f /etc/DIR_COLORS ]] ; then + # People might have customized the system database. + used_default_dircolors="maybe" + eval "$(dircolors -b /etc/DIR_COLORS)" + else + used_default_dircolors="yes" + eval "$(dircolors -b)" + fi + if [[ -n ${LS_COLORS:+set} ]] ; then + use_color=true + fi + unset used_default_dircolors +else + # Some systems (e.g. BSD & embedded) don't typically come with + # dircolors so we need to hardcode some terminals in here. + case ${TERM} in + [aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;; + esac +fi + +if ${use_color} ; then + 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='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 sh |