bashrc: git-prompt for Fedora

[dotfiles] / .bashrc

diff --git a/.bashrc b/.bashrc
index 8a8408861533eec7bc4aecec7fd241679aa5ca91..5d2f8b203b112da43f56619898298518ab135034 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,4 +1,5 @@
 # shellcheck disable=SC1090 disable=SC1091 # -- Can't follow non-constant source
+# shellcheck disable=SC1003 # -- Don't complain about '\e\\'
 
 ###########################
 # Settings for all shells #
@@ -63,6 +64,15 @@ export HISTTIMEFORMAT='%F %T '
 
 [ -r /etc/bash_completion ] && source /etc/bash_completion
 
+
+###############
+# Pager setup #
+###############
+
+export PAGER='less'
+export LESS='RS'
+
+
 ##################
 # Terminal setup #
 ##################
@@ -92,6 +102,7 @@ function find_up_exists {
 
 for p in /usr/lib/git-core/git-sh-prompt \
          /usr/share/git/completion/git-prompt.sh \
+         /usr/share/git-core/contrib/completion/git-prompt.sh \
          /usr/local/share/git-core/contrib/completion/git-prompt.sh
 do
     [ -r "$p" ] && source "$p" && break
@@ -120,15 +131,9 @@ function my_svn_ps1 {
 
 # Two line prompt
 PS1=''
-PS1="$PS1"'\[\033[01;31m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]'
-PS1="$PS1"'\[\033[01;36m\]$(my_git_ps1 ; my_hg_ps1 ; my_svn_ps1)\[\033[00m\]'
-
-if ! [[ "$TERM" =~ ^screen ]]; then
-    PS1="$PS1"'\n\$ '
-else
-    # matches with shelltitle in .screenrc
-    PS1="$PS1"'\n\[\033k\033\\\]\$> '
-fi
+PS1="$PS1"'\[\e[01;31m\]\u@\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]'
+PS1="$PS1"'\[\e[01;36m\]$(my_git_ps1 ; my_hg_ps1 ; my_svn_ps1)\[\e[00m\]'
+PS1="$PS1"'\n\$ '
 
 
 #################################
@@ -136,40 +141,24 @@ fi
 #################################
 
 function print_exit_code {
-    _exit_msg="\\033[01;33mexit code: $?\\033[00m"
+    local exit_code="$?"
     if [ -z "${BASH_SOURCE[1]}" ]; then
-        echo -e "$_exit_msg"
+        printf '\e[01;33mexit code: %s\e[00m\n' \
+            "$exit_code"
     fi
-    unset _exit_msg
 }
 trap print_exit_code ERR
 
 
-###############
-# Pager setup #
-###############
-
-export PAGER='less'
-export LESS='RS'
-
-
-################
-# Editor setup #
-################
 
-if emacsclient --version &> /dev/null; then
-    export ALTERNATE_EDITOR='vim'
-    export EDITOR='emacsclient --tty'
+####################
+# Function aliases #
+####################
 
-    if [[ "$TERM" == screen* ]]; then
-        alias edit='emacsclient --tty'
-    else
-        alias edit='emacsclient --create-frame --no-wait'
-    fi
-else
-    export EDITOR='vim'
-    alias edit='vim'
-fi
+# This prevents long/ugly command lines from showing up in xterm titles
+function aliasf {
+    eval "function $1 { $2 \$@; }"
+}
 
 
 ##########################
@@ -202,14 +191,14 @@ alias  l='ls -halF'
 
 alias _psresources='ps -wAo pid,user,%cpu,%mem,stat,start,time,args'
 if [ "$(uname)" = "Linux" ]; then
-    alias pscpu='_psresources --sort -%cpu|less -S'
-    alias psmem='_psresources --sort -%mem|less -S'
-    alias pstree='ps --forest -weo pid,user:16,args --sort start_time|less -S'
-    alias pstime='ps -wAo pid,user,lstart,args --sort start_time|less -S'
+    aliasf pscpu '_psresources --sort -%cpu|less -S'
+    aliasf psmem '_psresources --sort -%mem|less -S'
+    aliasf pstree 'ps --forest -weo pid,user:16,args --sort start_time|less -S'
+    aliasf pstime 'ps -wAo pid,user,lstart,args --sort start_time|less -S'
 else
-    alias pscpu='_psresources -r|less -S'
-    alias psmem='_psresources -m|less -S'
-    alias pstime='ps -wAo pid,user,lstart,args|less -S'
+    aliasf pscpu '_psresources -r|less -S'
+    aliasf psmem '_psresources -m|less -S'
+    aliasf pstime 'ps -wAo pid,user,lstart,args|less -S'
 fi
 
 #################
@@ -221,13 +210,12 @@ if echo x | grep -q --color=auto x &> /dev/null; then
     alias grep='grep --color=auto'
 fi
 alias rg='rg -p'
-alias scp='scp -o ControlPath=none'
 alias bc='bc -ql'
 alias watch='watch -n1'
 alias sudo='sudo ' # ability to use aliases with sudo
-alias sudosu='sudo su -l -s /bin/bash'
-alias python='PYTHONSTARTUP=~/.pythonrc.py python3'
-alias webshare='python3 -mhttp.server'
+aliasf sudosu 'sudo su -l -s /bin/bash'
+aliasf python 'PYTHONSTARTUP=~/.pythonrc.py python3'
+aliasf webshare 'python3 -mhttp.server'
 
 if ! command -v pbcopy &> /dev/null; then
     alias pbcopy='xsel --clipboard --input'
@@ -274,6 +262,25 @@ function ssh_unsafe {
 }
 
 
+##################
+# Editor aliases #
+##################
+
+if emacsclient --version &> /dev/null; then
+    export ALTERNATE_EDITOR='vim'
+    export EDITOR='emacsclient --tty'
+
+    if [[ "$TERM" == screen* ]]; then
+        aliasf edit 'emacsclient --tty'
+    else
+        aliasf edit 'emacsclient --create-frame --no-wait'
+    fi
+else
+    export EDITOR='vim'
+    aliasf edit 'vim'
+fi
+
+
 #########################
 # Optional local config #
 #########################
@@ -285,12 +292,33 @@ function ssh_unsafe {
 # xterm titlebar #
 ##################
 
-# When at a prompt display `hostname:workingdir`
-PROMPT_COMMAND='echo -ne "\\033]0;$(hostname|cut -d. -f1):${PWD/$HOME/\~}\\007"'
+# When at a prompt display `workingdir (hostname)`
+function print_title_prompt {
+    printf '\e]0;bash:%s (%s)\a' \
+        "${PWD/$HOME/\~}" \
+        "$(hostname -s)"
+
+    if [[ "$TERM" == screen* ]]; then
+        printf '\ekbash\e\\'
+    fi
+}
+PROMPT_COMMAND=print_title_prompt
+
+# Display the command about to be executed. This must go at the end of the
+# bashrc to avoid running the trap on commands in the bashrc
+function print_title_exec {
+    [ "$BASH_COMMAND" = "$PROMPT_COMMAND" ] && return
+
+    printf '\e]0;%s (%s)\a' \
+        "$(tr -cd '[:graph:] ' <<< "$BASH_COMMAND")" \
+        "$(hostname -s)"
 
-# Display the command about to be executed
-# This must go at the end of bashrc to avoid running the trap on commands in the bashrc
-trap 'echo -ne "\\033]0;$BASH_COMMAND\007"' DEBUG
+    if [[ "$TERM" == screen* ]]; then
+        printf '\ek%s\e\\' \
+            "$(sed -n -e 's/sudo //' -e 's/ .*//' -e 1p <<< "$BASH_COMMAND")"
+    fi
+}
+trap print_title_exec DEBUG
 
 
 ###########