save

Author: Vasiliy Polyakov

.gitattributes

@@ -1,8 +1,9 @@
 * text=auto
 
-*.sh    eol=lf
-*.bash  eol=lf
-*.bats  eol=lf
+*.sh    text eol=lf
+*.bash  text eol=lf
+*.bats  text eol=lf
+*.awk   text eol=lf
 
 *.md    text
 

lib.bash

@@ -41,7 +41,8 @@ title() { false; }
 ## @retval  0  Sourced.
 ## @retval  1  Not sourced.
 is_sourced() {
-  [[ ${FUNCNAME[${1:-1}]} == 'source' ]]
+  local -i frame="${1:-1}"
+  [[ ${FUNCNAME[frame]} == 'source' ]]
 }
 
 ## @brief   Is this script imported?
@@ -55,21 +56,22 @@ is_imported() {
 }
 
 ## @brief   Import a library file only once.
-## @detail  Use `import_once || return $?`
+## @detail  Use `import_once || return $(($?-1))`
 ##          at the beginning of the Bash library file (@c lib/*.sh).
 ## @return  Import error.
 ## @retval    0  OK.
-## @retval    1  Bash lib was not initialized correctly.
-## @retval    2  This lib was not imported correctly.
+## @retval    1  Library has been imported already.
+## @retval    2  Bash lib was not initialized correctly.
+## @retval    3  This library was not imported correctly.
 ## @retval  127  import_once: command not found (retured by Bash).
 import_once() {
-  [ x"$BASH_LIB" = x ] && return 1
+  [ x"$BASH_LIB" = x ] && return 2
 
   local name="$(relpath "${BASH_SOURCE[1]}" "$BASH_LIB")"
   name="${name%.*}"; name="_BASH_${name^^}_"
 
-  eval "(($name))" && return 0
-  is_imported 2 || return 2
+  eval "(($name))" && return 1
+  is_imported 2 || return 3
 
   local -i version="${1:-1}"
   eval "declare -gri $name='$version'"

lib/colors.sh

@@ -5,89 +5,86 @@
 ## @pre     lib.bash  (Bash scripting library).
 ## @pre     ncurses   (tput).
 
-import_once || return $?
+import_once || return $(($?-1))
 
-declare -gi COLORS
-declare -ga FG BG
-declare -gA SGR
+if ! type -p tput >/dev/null || [[ $1 == '0' ]]; then
+  declare -gir COLORS=0
+  declare -gr SGR0=''
+  SGR() { :; }
+  return 0
+fi
 
-local -i arrays=0 funcs=0 terminfo=0
-while (( $# )); do
-  case $1 in
-    0) declare -r COLORS=0 FG=() BG=() SGR=(); return 0 ;;
-    funcs) funcs=1 ;;
-    arrays) arrays=1 ;;
-    terminfo) terminfo=1 ;;
-  esac; shift
-do
+declare -gir COLORS="$(tput colors)"
+declare -gr  SGR0=$'\e[m'
 
-COLORS="$(tput colors)"
+_colors::to_attr() {
+  local OPT OPTARG
+  local -i OPTIND color bg=0
 
-_colors::get() {
-  
+  while getopts ':bf' OPT; do
+    case $OPT in
+      f) bg=0  ;;
+      b) bg=10 ;;
+    esac
+  done; shift $(( OPTIND - 1 ))
+
+  color="$1"
+
+  if (( color < 8 && color >= 0 )); then
+    echo $(( color + 30 + bg ))
+  elif (( color < 16 )); then
+    echo $(( color + 82 + bg ))
+  elif (( color < 256 )); then
+    echo $(( 38 + bg )) 5 $color
+  fi
 }
 
 SGR() {
+  local OPT OPTARG E='-e' P0='' P1=''
   local -i OPTIND
-  local OPT OPTARG
-  local -a a
+  local -a A C C8 C16 C256
+  
+  while getopts ':Ep' OPT; do
+    case $OPT in
+      E) E='' ;;
+      p) P0='\[' P1='\]' ;;
+    esac
+  done; shift $(( OPTIND - 1 ))
 
-  shopt -qs extglob
   while (( $# )); do
     case $1 in
-      fg=+([0-9])) a+=() ;;
+      fg=+([0-9])) C+=($(_colors::to_attr -f "${1#*=}")) ;;
+      bg=+([0-9])) C+=($(_colors::to_attr -b "${1#*=}")) ;;
+      fg8=+([0-9])) C8+=($(_colors::to_attr -f "${1#*=}")) ;;
+      bg8=+([0-9])) C8+=($(_colors::to_attr -b "${1#*=}")) ;;
+      fg16=+([0-9])) C16+=($(_colors::to_attr -f "${1#*=}")) ;;
+      bg16=+([0-9])) C16+=($(_colors::to_attr -b "${1#*=}")) ;;
+      fg256=+([0-9])) C256+=($(_colors::to_attr -f "${1#*=}")) ;;
+      bg256=+([0-9])) C256+=($(_colors::to_attr -b "${1#*=}")) ;;
+      fg=@(default|def|d)) A+=(39) ;;
+      bg=@(default|def|d)) A+=(49) ;;
+      reset|r) A+=(0) ;;
+      bold|b) A+=(1) ;;
+      dim) A+=(2) ;;
+      italics|i) A+=(3) ;;
+      underline|undescore|uline|ul|u) A+=(4) ;;
+      blink) A+=(5) ;;
+      reverse|inverse) A+=(7) ;;
+      normal|n) A+=(22) ;;
+      +([0-9])) A+=($1)
     esac; shift
   done
-}
-
-_colors::init_arrays() {
-  local -i c
-
-  if (( terminfo )); then
-    for (( c = 0; c < COLORS; c++ )); do
-      FG[c]="$(tput setaf "$c")"
-      BG[c]="$(tput setab "$c")"
-    done
-    SGR[bold]="$(tput bold)"
-    SGR[dim]="$(tput dim)"
-    SGR[italics]="$(tput sitm)"
-    SGR[uline]="$(tput smul)"
-    SGR[blink]="$(tput blink)"
-    SGR[reverse]="$(tput rev)"
-    SGR[reset]="$(tput sgr0)"
+  
+  local -n c="C$COLORS"
+  if (( ${#c[@]} )); then
+    A+=("${c[@]}")
   else
-    local CSI=$'\e['
-    for (( c = 0; c < 8 && COLORS >= 8; c++ )); do
-      FG[c]="${CSI}$((30+c))m"
-      BG[c]="${CSI}$((40+c))m"
-    done
-    for (( c = 8; c < 16 && COLORS >= 16; c++ )); do
-      FG[c]="${CSI}$((82+c))m"
-      BG[c]="${CSI}$((92+c))m"
-    done
-    for (( c = 16; c < 256 && COLORS >= 256; c++ )); do
-      FG[c]="${CSI}38;5;${c}m"
-      BG[c]="${CSI}48;5;${c}m"
-    done
-    SGR[bold]="${CSI}1m"
-    SGR[dim]="${CSI}2m"
-    SGR[italics]="${CSI}3m"
-    SGR[uline]="${CSI}4m"
-    SGR[blink]="${CSI}5m"
-    SGR[reverse]="${CSI}7m"
-    SGR[reset]="${CSI}m"
-    unset CSI
+    A+=("${C[@]}")
   fi
-  # TODO: add one-letter and digit aliases for SGR
-  SGR[rev]="${SGR[reverse]}"
-  SGR[exit]="${SGR[reset]}"
-  SGR[0]="${SGR[reset]}"
-  SGR[1]="${SGR[bold]}"
-}
-
-colors::unset() {
 
+  if (( ${#A[@]} )); then
+    local IFS=';'
+    echo -n $E "$P0\e[${A[*]}m$P1"
+  fi
 }
 
-declare -r COLORS FG BG SGR
-

lib/exceptions.sh

@@ -5,7 +5,7 @@
 ## @pre     lib.bash     (Bash scripting library).
 ## @pre     sysexits.sh  (exit/return code constants).
 
-import_once || return $?
+import_once || return $(($?-1))
 import sysexits
 
 ####  Private functions  ##################################################@{1

lib/git.sh

@@ -5,7 +5,7 @@
 ## @pre     lib.bash  (Bash scripting library).
 ## @pre     Git       (Git VCS).
 
-import_once || return $?
+import_once || return $(($?-1))
 
 git::in_work_tree() {
   local inside="$(git rev-parse --is-inside-work-tree 2>/dev/null)"

lib/prompt.sh

@@ -8,20 +8,25 @@
 ## @see https://www.askapache.com/linux/bash-power-prompt/
 ## @see https://gitweb.gentoo.org/repo/gentoo.git/tree/app-shells/bash/files/bashrc
 
-import_once || return $?
+import_once || return $(($?-1))
 import colors
+import title
 import git
 
 declare -gA PROMPT_COLOR PROMPT_CHAR
+declare -gi PROMPT_TITLE=1
 
-PROMPT_COLOR[user]=10
-PROMPT_COLOR[root]=9
-PROMPT_COLOR[host]='6 6 36'
-PROMPT_COLOR[branch]='5 13 207'
-PROMPT_COLOR[changed]=3
-PROMPT_COLOR[staged]=11
-PROMPT_COLOR[action]=9
-PROMPT_COLOR[venv]='3 3 190'
+PROMPT_COLOR[user]='fg=10 bold'
+PROMPT_COLOR[root]='fg=9 bold'
+PROMPT_COLOR[host]='fg=6 fg256=36 bold'
+PROMPT_COLOR[dir]='fg=15 bold'
+PROMPT_COLOR[git]='fg=10'
+PROMPT_COLOR[branch]='fg8=5 fg16=13 fg256=207'
+PROMPT_COLOR[changed]='fg=3'
+PROMPT_COLOR[staged]='fg=11'
+PROMPT_COLOR[action]='fg=9'
+PROMPT_COLOR[ssh]='fg=9 bold'
+PROMPT_COLOR[venv]='fg=3 fg256=190'
 
 PROMPT_CHAR[user]='>'
 PROMPT_CHAR[root]='#'
@@ -35,58 +40,68 @@ PROMPT_CHAR[staged]='⊛'
 PROMPT_CHAR[stashed]='+'
 
 prompt::init() {
-  declare -g PROMPT_COMMAND='prompt::cmd'
-  
-  for k in "${!PROMPT_COLOR[@]}"; do
-    local -a c=(${PROMPT_COLOR[$k]})
-    PROMPT_COLOR[$k]="$(tput setaf "${c[${#c[@]}==1||COLORS==8?0:COLORS==16?1:2]}")"
+  local name
+
+  for name in "${!PROMPT_COLOR[@]}"; do
+    PROMPT_COLOR[$name]="$(SGR -p ${PROMPT_COLOR[$name]})"
   done
-  
-  prompt='\[\e[1;38;5;$((EUID?10:9))m\]\u\[\e[m\]@\[\e[1;38;5;36m\]\h\[\e[m\]:\[\e[1;38;5;12m\]\w\[\e[m\]'
-  char='\[\e[1;38;5;$((EUID?10:9))m\]$(prompt::char)\[\e[m\]'
-  if [[ -n $MC_SID ]]; then  # Bash is inside of Midnight Commander
-    PS1="$prompt$char "
-  else
-    PS1="╭$prompt\$(prompt::vcs)\$(prompt::venv)\n╰$char "
+
+  if [[ -z $debian_chroot && -r /etc/debian_chroot ]]; then
+    debian_chroot="$(cat /etc/debian_chroot)"
   fi
-  unset prompt char
+
+  declare -r PROMPT_COLOR PROMPT_CHAR
+  declare -g PROMPT_COMMAND='prompt::cmd;'
   export VIRTUAL_ENV_DISABLE_PROMPT=1
 }
 
 prompt::vcs() {
-  local status
+  local status action
+
   if git::in_work_tree || git::in_git_dir; then
-    status="git:${PROMPT_COLOR[branch]}$(git::branch)${PROMPT_COLOR[reset]}"
-    git::is_changed && status+="${PROMPT_COLOR[changed]}*${PROMPT_COLOR[reset]}"
-    git::is_staged  && status+="${PROMPT_COLOR[staged]}⊛${PROMPT_COLOR[reset]}"
-    local action="$(git::action)"
-    [[ -n $action ]] && status+="\e[38;5;9m $action${PROMPT_COLOR[reset]}"
+    status="${PROMPT_COLOR[git]}${PROMPT_CHAR[git]}$R"
+    status+="${PROMPT_COLOR[branch]}$(git::branch)$R"
+    git::is_changed && status+="${PROMPT_COLOR[changed]}${PROMPT_CHAR[changed]}$R"
+    git::is_staged  && status+="${PROMPT_COLOR[staged]}${PROMPT_CHAR[staged]}$R"
+    action="$(git::action)"
+    [[ -n $action ]] && status+="${PROMPT_COLOR[action]} $action$R"
+
+    echo -n " [$status]"
   fi
-  [[ -n $status ]] && echo -ne " [$status]"
 }
 
-prompt::venv() {
-  [[ -n $VIRTUAL_ENV ]] || return
+prompt::cmd() {
+  history -a
 
-  
-  echo -en " (${PROMPT_COLOR[venv]}${VIRTUAL_ENV##*/}${PROMPT_COLOR[reset]})"
-}
+  if [[ -n $MC_SID ]]; then
+    # In Midnight Commander
+    PS1='\u@\h:\w\$ '
+    return
+  fi
 
-prompt::user_color() {
-  (( EUID )) && echo -en "${PROMPT_COLOR[user]}" || echo -en "${PROMPT_COLOR[root]}"
-}
+  local R="\[$SGR0\]" x u='user' user at host dir venv char chroot
+  (( EUID )) || u='root'  # Superuser
 
-prompt::user_char() {
-  (( EUID )) && echo -en "${PROMPT_CHAR[user]}" || echo -en "${PROMPT_CHAR[root]}"
-}
+  # Set prompt fragments
+  user="${PROMPT_COLOR[$u]}\u$R"
+  at="${PROMPT_CHAR[at]}"
+  host="${PROMPT_COLOR[host]}\h$R"
+  dir="${PROMPT_COLOR[dir]}\w$R"
+  char="${PROMPT_COLOR[$u]}${PROMPT_CHAR[$u]}$R"
+  chroot="${debian_chroot:+($debian_chroot) }"
 
-prompt::ssh_color() {
-  [[ -n $SSH_TTY ]] && echo -en "${PROMPT_COLOR[ssh]}" || echo -en "${PROMPT_COLOR[host]}"
-}
+  if [[ -n $SSH_TTY ]]; then
+    # Connected over SSH
+    at="${PROMPT_COLOR[ssh]}${PROMPT_CHAR[at]}$R"
+  fi
+  if [[ -n $VIRTUAL_ENV ]]; then
+    # Python virtual environment is activated
+    venv=" (${PROMPT_COLOR[venv]}$(relpath "$VIRTUAL_ENV")$R)"
+  fi
 
-prompt::cmd() {
-  local x
-  history -a
-  [[ -z $MC_SID ]] && echo -en '\e[6n' && read -sdR x && (( ${x##*;} > 1 )) && echo
+  # Set prompt
+  PS1="╭$chroot$user$at$host:$dir$(prompt::vcs)$venv\n╰$char "
+
+  echo -en '\e[6n' && read -sdR x && (( ${x##*;} > 1 )) && echo
 }
 

lib/sysexits.sh

@@ -11,7 +11,7 @@
 ##          (/usr/include/sysexits.h
 ##          or http://linux.die.net/include/sysexits.h)
 
-import_once || return $?
+import_once || return $(($?-1))
 
 ####  Functions  ##########################################################@{1
 _sysexits::from_h() {