From: Jannik ZANDER Date: Mon, 18 Jun 2018 06:35:10 +0000 (+0200) Subject: Simple call git-prompt.sh X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=e6924c1ce675c78928386d8f64ef18bc8f8f7c66;p=dotfiles.git Simple call git-prompt.sh --- diff --git a/.config/bash/environ b/.config/bash/environ index 94fb85d..7c21b81 100644 --- a/.config/bash/environ +++ b/.config/bash/environ @@ -3,44 +3,11 @@ if [ -d "$HOME/bin" ] ; then PATH="$HOME/bin:$PATH" fi -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color|*-256color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#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 -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +# Set prompt +if [ -f /etc/profile.d/git-prompt.sh ]; then + . /etc/profile.d/git-prompt.sh fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - # colored GCC warnings and errors export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'