]> Frank Brehm's Git Trees - config/uhu1/etc.git/commitdiff
saving uncommitted changes in /etc prior to emerge run
authorroot <root@uhu1.uhu-banane.de>
Fri, 11 Nov 2016 09:32:59 +0000 (10:32 +0100)
committerroot <root@uhu1.uhu-banane.de>
Fri, 11 Nov 2016 09:32:59 +0000 (10:32 +0100)
.etckeeper
config-archive/etc/bash/bashrc
config-archive/etc/bash/bashrc.1
config-archive/etc/bash/bashrc.2
config-archive/etc/bash/bashrc.3
config-archive/etc/bash/bashrc.4 [new file with mode: 0644]
config-archive/etc/bash/bashrc.dist.new

index b5f8ae8eb5073804dba162b549cccc27078c989f..62b61f7b0ef5a810437910eb562d892ec45fb914 100755 (executable)
@@ -293,6 +293,7 @@ maybe chmod 0644 'config-archive/etc/bash/bashrc'
 maybe chmod 0644 'config-archive/etc/bash/bashrc.1'
 maybe chmod 0644 'config-archive/etc/bash/bashrc.2'
 maybe chmod 0644 'config-archive/etc/bash/bashrc.3'
+maybe chmod 0644 'config-archive/etc/bash/bashrc.4'
 maybe chmod 0755 'config-archive/etc/bash/bashrc.d'
 maybe chmod 0644 'config-archive/etc/bash/bashrc.d/bash_completion.sh'
 maybe chmod 0644 'config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new'
index 71fa4c53ae197caf0210997e75d172309809d6c4..c948ee8ef13a6ffbf437500136704d7d42b58b20 100644 (file)
@@ -21,15 +21,32 @@ fi
 shopt -s checkwinsize
 
 # Enable history appending instead of overwriting.  #139609
+# 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
        xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
-               PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
+               PROMPT_COMMAND='history -a; echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
                ;;
        screen*)
-               PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
+               PROMPT_COMMAND='history -a; echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
+               ;;
+       *)
+               PROMPT_COMMAND='history -a'
                ;;
 esac
 
@@ -80,8 +97,12 @@ else
        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
+unset use_color safe_term match_lhs sh
 
 if [ -d /usr/scripts ] ; then
   PATH=/usr/scripts:$PATH
@@ -153,7 +174,7 @@ if [ -f /usr/share/mc/mc.gentoo ]; then
     . /usr/share/mc/mc.gentoo
 fi
 
-if [ -e /etc/bash_completion.d/git ] ; then
+if type -t __git_ps1 >/dev/null ; then
     if [[ ${EUID} == 0 ]] ; then
         PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]'
     else
index c5f19a64108c5b500106cc4746f84b0332fe3d24..71fa4c53ae197caf0210997e75d172309809d6c4 100644 (file)
@@ -25,7 +25,7 @@ shopt -s histappend
 
 # Change the window title of X terminals 
 case ${TERM} in
-       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix)
+       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
                PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
                ;;
        screen*)
index b0904ff22f833c44ca2ad29480c15abbf22b4053..c5f19a64108c5b500106cc4746f84b0332fe3d24 100644 (file)
@@ -25,10 +25,10 @@ shopt -s histappend
 
 # Change the window title of X terminals 
 case ${TERM} in
-       xterm*|rxvt*|Eterm|aterm|kterm|gnome*|interix)
+       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix)
                PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
                ;;
-       screen)
+       screen*)
                PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
                ;;
 esac
@@ -69,6 +69,8 @@ if ${use_color} ; then
 
        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
index cb99ed9562030cfaa0e9b05ce6614d22c87b43d2..b0904ff22f833c44ca2ad29480c15abbf22b4053 100644 (file)
@@ -91,9 +91,21 @@ if [ -d $HOME/bin ] ; then
   export PATH
 fi
 
-if [ -d $HOME/lib ] ; then
-  PERL5LIB=$HOME/lib
-  export PERL5LIB
+if [ -d "$HOME/lib" ] ; then
+    if [ -d "$HOME/lib/perl" ] ; then
+        if [ -z "${PERL5LIB}" ] ; then
+            export PERL5LIB="$HOME/lib/perl"
+        else
+            export PERL5LIB="$HOME/lib/perl:${PERL5LIB}"
+        fi
+    fi
+    if [ -d "$HOME/lib/python" ] ; then
+        if [ -z "${PYTHONPATH}" ] ; then
+            export PYTHONPATH="$HOME/lib/python"
+        else
+            export PYTHONPATH="$HOME/lib/python:${PYTHONPATH}"
+        fi
+    fi
 fi
 
 #if [[ ${EUID} == 0 ]] ; then
@@ -139,8 +151,7 @@ if [ -f /usr/share/mc/mc.gentoo ]; then
     . /usr/share/mc/mc.gentoo
 fi
 
-if [ -f /etc/profile.d/bash-completion ]; then
-    . /etc/profile.d/bash-completion
+if [ -e /etc/bash_completion.d/git ] ; then
     if [[ ${EUID} == 0 ]] ; then
         PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]'
     else
diff --git a/config-archive/etc/bash/bashrc.4 b/config-archive/etc/bash/bashrc.4
new file mode 100644 (file)
index 0000000..cb99ed9
--- /dev/null
@@ -0,0 +1,152 @@
+# /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\] '
+               PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w \$ \[\033[00m\]'
+       else
+               #PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+               PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\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
+
+if [ -d /usr/scripts ] ; then
+  PATH=/usr/scripts:$PATH
+  export PATH
+fi
+
+if [ -d $HOME/bin ] ; then
+  PATH=$PATH:$HOME/bin
+  export PATH
+fi
+
+if [ -d $HOME/lib ] ; then
+  PERL5LIB=$HOME/lib
+  export PERL5LIB
+fi
+
+#if [[ ${EUID} == 0 ]] ; then
+#  alias ll="ls -lA"
+#else
+#  alias ll="ls -l"
+#fi
+alias l="ls -l"
+alias ll="ls -lA"
+alias la="ls -la"
+alias md=mkdir
+alias rd=rmdir
+alias ..='cd ..'
+alias ...='cd ../..'
+alias cd..='cd ..'
+alias cd...='cd ../..'
+alias pl="ps -fu $(whoami)"
+
+lcd() {
+    cd $( perl -e '
+use strict;
+use Cwd;
+my $new = shift;
+my $cwd = Cwd::abs_path(getcwd());
+my $newa = $cwd;
+if ($new){
+    $newa = Cwd::abs_path($new);
+    $newa = $cwd unless $newa;
+};
+printf("%s\n", $newa);
+' $1 )
+}
+
+export LESS="-R -M -I --shift 5"
+export LESSCHARSET="utf-8"
+
+HISTCONTROL=ignoreboth
+HISTSIZE=50000
+HISTFILESIZE=50000
+HISTTIMEFORMAT='%Y-%m-%d %H:%M:%S '
+
+if [ -f /usr/share/mc/mc.gentoo ]; then
+    . /usr/share/mc/mc.gentoo
+fi
+
+if [ -f /etc/profile.d/bash-completion ]; then
+    . /etc/profile.d/bash-completion
+    if [[ ${EUID} == 0 ]] ; then
+        PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]'
+    else
+        PS1='$? \[\033[01;32m\]\u@\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] > \[\033[00m\]'
+    fi
+fi
+
+
+# vim: ts=4 expandtab
index 7006bf9f1a8d5f128244596534356fbc4269d2b0..89848361af6a2ceb07a051a5172ffb8ba5a1d122 100644 (file)
@@ -38,7 +38,7 @@ shopt -s histappend
 
 # Change the window title of X terminals 
 case ${TERM} in
-       xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
+       [aEkx]term*|rxvt*|gnome*|konsole*|interix)
                PS1='\[\033]0;\u@\h:\w\007\]'
                ;;
        screen*)
@@ -49,32 +49,42 @@ case ${TERM} in
                ;;
 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
+# first to take advantage of user additions.
+# We run dircolors directly due to its changes in file syntax and
+# terminal name patching.
+use_color=false
+if type -P dircolors >/dev/null ; 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
+       LS_COLORS=
+       if [[ -f ~/.dir_colors ]] ; then
+               eval "$(dircolors -b ~/.dir_colors)"
+       elif [[ -f /etc/DIR_COLORS ]] ; then
+               eval "$(dircolors -b /etc/DIR_COLORS)"
+       else
+               eval "$(dircolors -b)"
        fi
+       # Note: We always evaluate the LS_COLORS setting even when it's the
+       # default.  If it isn't set, then `ls` will only colorize by default
+       # based on file attributes and ignore extensions (even the compiled
+       # in defaults of dircolors). #583814
+       if [[ -n ${LS_COLORS:+set} ]] ; then
+               use_color=true
+       else
+               # Delete it if it's empty as it's useless in that case.
+               unset LS_COLORS
+       fi
+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
@@ -99,4 +109,4 @@ for sh in /etc/bash/bashrc.d/* ; do
 done
 
 # Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term match_lhs sh
+unset use_color sh