|
|
@@ -4,8 +4,8 @@
|
|
|
|
|
|
# If not running interactively, don't do anything
|
|
|
case $- in
|
|
|
- *i*) ;;
|
|
|
- *) return;;
|
|
|
+ *i*) ;;
|
|
|
+*) return;;
|
|
|
esac
|
|
|
|
|
|
# don't put duplicate lines or lines starting with space in the history.
|
|
|
@@ -32,12 +32,12 @@ shopt -s checkwinsize
|
|
|
|
|
|
# set variable identifying the chroot you work in (used in the prompt below)
|
|
|
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
|
|
|
- debian_chroot=$(cat /etc/debian_chroot)
|
|
|
+ debian_chroot=$(cat /etc/debian_chroot)
|
|
|
fi
|
|
|
|
|
|
# set a fancy prompt (non-color, unless we know we "want" color)
|
|
|
case "$TERM" in
|
|
|
- xterm-color) color_prompt=yes;;
|
|
|
+ xterm-color) color_prompt=yes;;
|
|
|
esac
|
|
|
|
|
|
# uncomment for a colored prompt, if the terminal has the capability; turned
|
|
|
@@ -46,43 +46,43 @@ esac
|
|
|
#force_color_prompt=yes
|
|
|
|
|
|
if [ -n "$force_color_prompt" ]; then
|
|
|
- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
|
|
|
- # We have color support; assume it's compliant with Ecma-48
|
|
|
- # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
|
|
|
- # a case would tend to support setf rather than setaf.)
|
|
|
- color_prompt=yes
|
|
|
- else
|
|
|
- color_prompt=
|
|
|
- fi
|
|
|
+ if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
|
|
|
+ # We have color support; assume it's compliant with Ecma-48
|
|
|
+ # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
|
|
|
+ # a case would tend to support setf rather than setaf.)
|
|
|
+ color_prompt=yes
|
|
|
+ else
|
|
|
+ color_prompt=
|
|
|
+ fi
|
|
|
fi
|
|
|
|
|
|
if [ "$color_prompt" = yes ]; then
|
|
|
- PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
|
|
+ PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
|
|
else
|
|
|
- PS1='[\u@\h \W]\$ '
|
|
|
+ PS1='[\u@\h \W]\$ '
|
|
|
fi
|
|
|
unset color_prompt force_color_prompt
|
|
|
|
|
|
# If this is an xterm set the title to user@host:dir
|
|
|
case "$TERM" in
|
|
|
-xterm*|rxvt*)
|
|
|
+ xterm*|rxvt*)
|
|
|
#PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\]$PS1"
|
|
|
PS1='[\u@\h \W]\$ '
|
|
|
;;
|
|
|
-*)
|
|
|
+ *)
|
|
|
;;
|
|
|
esac
|
|
|
|
|
|
# enable color support of ls and also add handy aliases
|
|
|
if [ -x /usr/bin/dircolors ]; then
|
|
|
- test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
|
|
- alias ls='ls --color=auto'
|
|
|
- #alias dir='dir --color=auto'
|
|
|
- #alias vdir='vdir --color=auto'
|
|
|
-
|
|
|
- alias grep='grep --color=auto'
|
|
|
- alias fgrep='fgrep --color=auto'
|
|
|
- alias egrep='egrep --color=auto'
|
|
|
+ test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
|
|
+ alias ls='ls --color=auto'
|
|
|
+ #alias dir='dir --color=auto'
|
|
|
+ #alias vdir='vdir --color=auto'
|
|
|
+
|
|
|
+ alias grep='grep --color=auto'
|
|
|
+ alias fgrep='fgrep --color=auto'
|
|
|
+ alias egrep='egrep --color=auto'
|
|
|
fi
|
|
|
|
|
|
# some more ls aliases
|
|
|
@@ -100,7 +100,7 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
|
|
|
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
|
|
|
|
|
if [ -f ~/.bash_aliases ]; then
|
|
|
- . ~/.bash_aliases
|
|
|
+ . ~/.bash_aliases
|
|
|
fi
|
|
|
|
|
|
# enable programmable completion features (you don't need to enable
|
