Merge branch 'master' into gaelic-plugins

* master:
  remove superfluous function and pick better var names for readability
  Update base.theme.bash
  Update base.theme.bash
  Update base.theme.bash
  Update base.theme.bash
  Fix for 2323 issue
  Apply fixes
  Add `.git-blame-ignore-revs`
  Clean themes A-L
  Update powerline-multiline.base.bash
  Fix a couple bugs introduced by last commit
  Fix bad merge
  important syntax correction from the owenr of ble.sh
  only the correct FZF integration loads, sepending on whether the blesh plugin is enabled as well.
  readonly HIST* variables is a bit extreme and clashes with ble.sh and other tools.
  Fix node and ruby colors
  Update themes/base.theme.bash
  lib/theme: use `_command_exists()`
  `node_version_prompt` should work without NVM

Author: Ira Abramov

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# Ignore shfmt related commits
+003b0ce802c10ab6e161d7ba5a7d9b6722312cc5
+7c2c2a5525557cbfee98e73de921fd7f7e6811a1
+d37505b636ca7bc95301d8daaf9c58a3186ce57a
+d7695d5456b980190b6d1c4a4715b13d1b63c332

clean_files.txt

@@ -43,7 +43,6 @@ themes/atomic
 themes/axin
 themes/bakke
 themes/barbuk
-themes/base.theme.bash
 themes/binaryanomaly
 themes/bira
 themes/bobby
@@ -55,19 +54,28 @@ themes/clean
 themes/codeword
 themes/cooperkid
 themes/cupcake
+themes/demula
+themes/dos
 themes/doubletime
 themes/doubletime_multiline
 themes/doubletime_multiline_pyonly
 themes/dulcie
 themes/duru
 themes/easy
 themes/elixr
+themes/emperor
+themes/envy
 themes/essential
-themes/githelpers.theme.bash
+themes/font
+themes/gallifrey
 themes/gitline
+themes/hawaii50
 themes/inretio
+themes/iterate
+themes/kitsune
 themes/lambda
 themes/liquidprompt
+themes/luan
 themes/modern
 themes/norbu
 themes/oh-my-posh

plugins/available/blesh.plugin.bash

@@ -10,6 +10,10 @@ _bash_it_ble_path=${XDG_DATA_HOME:-$HOME/.local/share}/blesh/ble.sh
 if [[ -f $_bash_it_ble_path ]]; then
 	# shellcheck disable=1090
 	source "$_bash_it_ble_path" --attach=prompt
+	if _bash-it-component-item-is-enabled plugin fzf; then
+		ble-import -d integration/fzf-key-bindings
+		ble-import -d integration/fzf-completion
+	fi
 else
 	_log_error "Could not find ble.sh in $_bash_it_ble_path"
 	_log_error "Please install using the following command:"

plugins/available/fzf.plugin.bash

@@ -5,13 +5,15 @@
 cite about-plugin
 about-plugin 'load fzf, if you are using it'
 
-if [ -r ~/.fzf.bash ]; then
-	# shellcheck disable=SC1090
-	source ~/.fzf.bash
-elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then
-	# shellcheck disable=SC1091
-	source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
-fi
+if ! _bash-it-component-item-is-enabled plugin blesh; then
+	if [ -r ~/.fzf.bash ]; then
+		# shellcheck disable=SC1090
+		source ~/.fzf.bash
+	elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then
+		# shellcheck disable=SC1091
+		source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
+	fi
+fi # only sources the keybindings and integration if blesh is not integrated already
 
 # No need to continue if the command is not present
 _command_exists fzf || return

plugins/available/history-eternal.plugin.bash

@@ -10,13 +10,13 @@ fi
 # truncating the history file early.
 
 # "Numeric values less than zero result in every command being saved on the history list (there is no limit)"
-readonly HISTSIZE=-1 2> /dev/null || true
+HISTSIZE=-1 2> /dev/null || true
 
 # "Non-numeric values and numeric values less than zero inhibit truncation"
-readonly HISTFILESIZE='unlimited' 2> /dev/null || true
+HISTFILESIZE='unlimited' 2> /dev/null || true
 
 # Use a custom history file location so history is not truncated
 # if the environment ever loses this "eternal" configuration.
 HISTDIR="${XDG_STATE_HOME:-${HOME?}/.local/state}/bash"
 [[ -d ${HISTDIR?} ]] || mkdir -p "${HISTDIR?}"
-readonly HISTFILE="${HISTDIR?}/history" 2> /dev/null || true
+HISTFILE="${HISTDIR?}/history" 2> /dev/null || true

themes/agnoster/agnoster.theme.bash

@@ -235,7 +235,8 @@ prompt_histdt() {
 }
 
 git_status_dirty() {
-	dirty=$(git status -s 2> /dev/null | tail -n 1)
+	local dirty
+	dirty=$(git status --porcelain 2> /dev/null | tail -n 1)
 	[[ -n $dirty ]] && echo " ●"
 }
 

themes/barbuk/barbuk.theme.bash

@@ -50,8 +50,6 @@ GIT_THEME_PROMPT_CLEAN=" ${bold_green?}✓"
 GIT_THEME_PROMPT_PREFIX="${cyan?}"
 GIT_THEME_PROMPT_SUFFIX="${cyan?}"
 SCM_THEME_BRANCH_TRACK_PREFIX="${normal?} ⤏  ${cyan?}"
-SCM_THEME_CURRENT_USER_PREFFIX='  '
-SCM_GIT_SHOW_CURRENT_USER='false'
 NVM_THEME_PROMPT_PREFIX=''
 NVM_THEME_PROMPT_SUFFIX=''
 RVM_THEME_PROMPT_PREFIX=''
@@ -61,7 +59,7 @@ RBENV_THEME_PROMPT_SUFFIX=''
 RBFU_THEME_PROMPT_PREFIX=''
 RBFU_THEME_PROMPT_SUFFIX=''
 
-function _git-uptream-remote-logo() {
+function __git-uptream-remote-logo_prompt() {
 	[[ -z "$(_git-upstream)" ]] && SCM_GIT_CHAR="${SCM_GIT_CHAR_DEFAULT:-}"
 
 	local remote remote_domain
@@ -83,22 +81,7 @@ function _git-uptream-remote-logo() {
 
 function git_prompt_info() {
 	git_prompt_vars
-	echo -e " on ${SCM_GIT_CHAR_ICON_BRANCH:-} ${SCM_PREFIX:-}${SCM_BRANCH:-}${SCM_STATE:-}${SCM_GIT_AHEAD:-}${SCM_GIT_BEHIND:-}${SCM_GIT_STASH:-}${SCM_SUFFIX:-}"
-}
-
-function _exit-code() {
-	if [[ "${1:-}" -ne 0 ]]; then
-		exit_code=" ${purple?}${EXIT_CODE_ICON:-}${yellow?}${exit_code:-}${bold_orange?}"
-	else
-		exit_code="${bold_green?}"
-	fi
-}
-
-function _prompt() {
-	local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' python_venv='' host command_duration=
-	local scm_char scm_prompt_info
-
-	command_duration="$(_command_duration)"
+	echo -e "on $SCM_GIT_CHAR_ICON_BRANCH $SCM_PREFIX$SCM_BRANCH$SCM_STATE$SCM_GIT_AHEAD$SCM_GIT_BEHIND$SCM_GIT_STASH$SCM_SUFFIX "
 }
 
 function __exit_prompt() {
@@ -165,21 +148,17 @@ function __ssh_prompt() {
 		else
 			host="\h"
 		fi
-		ssh_info="${bold_blue?}\u${bold_orange?}@${cyan?}$host ${bold_orange?}in"
+		echo "${bold_blue?}\u${bold_orange?}@${cyan?}$host ${bold_orange?}in "
 	fi
 }
 
 function __python_venv_prompt() {
 	# Detect python venv
-	if [[ -n "${CONDA_DEFAULT_ENV:-}" ]]; then
-		python_venv="${PYTHON_VENV_CHAR:-}${CONDA_DEFAULT_ENV:-} "
-	elif [[ -n "${VIRTUAL_ENV:-}" ]]; then
-		python_venv="$PYTHON_VENV_CHAR${VIRTUAL_ENV##*/} "
+	if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+		echo "${bold_purple?}$PYTHON_VENV_CHAR${normal?}${CONDA_DEFAULT_ENV} "
+	elif [[ -n "${VIRTUAL_ENV}" ]]; then
+		echo "${bold_purple?}$PYTHON_VENV_CHAR${normal?}$(basename "${VIRTUAL_ENV}") "
 	fi
-
-	scm_char="$(scm_char)"
-	scm_prompt_info="$(scm_prompt_info)"
-	PS1="\\n${ssh_info} ${purple}${scm_char}${python_venv}${dir_color}\\w${normal}${scm_prompt_info}${command_duration}${exit_code}"
 }
 
 function __path_prompt() {

themes/base.theme.bash

@@ -175,6 +175,7 @@ function scm_prompt_vars() {
 	scm_prompt_char
 	SCM_DIRTY=0
 	SCM_STATE=''
+	SCM_BRANCH=''
 
 	local prompt_vars="${SCM}_prompt_vars"
 	_is_function "${prompt_vars}" && "${prompt_vars}"
@@ -393,20 +394,30 @@ function hg_prompt_vars() {
 	fi
 }
 
+function node_command_version_prompt() {
+	local node_version
+	if _command_exists node; then
+		node_version="$(node --version 2> /dev/null)"
+		if [[ -n ${node_version} ]]; then
+			echo -e "${NVM_THEME_PROMPT_PREFIX}${node_version}${NVM_THEME_PROMPT_SUFFIX}"
+		fi
+	fi
+}
+
 function nvm_version_prompt() {
-	local node
+	local nvm_ver
 	if _is_function nvm; then
-		node=$(nvm current 2> /dev/null)
-		[[ "${node}" == "system" ]] && return
-		echo -ne "${NVM_THEME_PROMPT_PREFIX-}${node}${NVM_THEME_PROMPT_SUFFIX-}"
+		nvm_ver=$(nvm current 2> /dev/null)
+		[[ "${nvm_ver}" == "system" ]] && return
+		echo -ne "${NVM_THEME_PROMPT_PREFIX-}${nvm_ver}${NVM_THEME_PROMPT_SUFFIX-}"
 	fi
 }
 
 function node_native_version_prompt() {
-	local node
+	local node_ver
 	if _command_exists node; then
-		node=$(node --version 2> /dev/null)
-		echo -ne "${NODE_THEME_PROMPT_PREFIX-}${node}${NODE_THEME_PROMPT_SUFFIX-}"
+		node_ver=$(node --version 2> /dev/null)
+		echo -ne "${NODE_THEME_PROMPT_PREFIX-}${node_ver}${NODE_THEME_PROMPT_SUFFIX-}"
 	fi
 }
 

themes/demula/demula.theme.bash

@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# shellcheck disable=SC2034 # Expected behavior for themes.
 
 # Theme inspired on:
 #  - Ronacher's dotfiles (mitsuhikos) - http://github.com/mitsuhiko/dotfiles/tree/master/bash/
@@ -10,40 +11,40 @@
 # Screenshot: http://goo.gl/VCmX5
 # by Jesus de Mula <jesus@demula.name>
 
-# For the real Monokai colors you should add these to your .XDefaults or
-# terminal configuration:
-#! ----------------------------------------------------------- TERMINAL COLORS
-#! monokai - http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
-#*background: #272822
-#*foreground: #E2DA6E
-#*color0: black
-#! mild red
-#*color1: #CD0000
-#! light green
-#*color2: #A5E02D
-#! orange (yellow)
-#*color3: #FB951F
-#! "dark" blue
-#*color4: #076BCC
-#! hot pink
-#*color5: #F6266C
-#! cyan
-#*color6: #64D9ED
-#! gray
-#*color7: #E5E5E5
+## For the real Monokai colors you should add these to your .XDefaults or
+## terminal configuration:
+## ! ----------------------------------------------------------- TERMINAL COLORS
+## ! monokai - http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
+## *background: #272822
+## *foreground: #E2DA6E
+## *color0: black
+## ! mild red
+## *color1: #CD0000
+## ! light green
+## *color2: #A5E02D
+## ! orange (yellow)
+## *color3: #FB951F
+## ! "dark" blue
+## *color4: #076BCC
+## ! hot pink
+## *color5: #F6266C
+## ! cyan
+## *color6: #64D9ED
+## ! gray
+## *color7: #E5E5E5
 
 # ----------------------------------------------------------------- COLOR CONF
-D_DEFAULT_COLOR="${normal}"
-D_INTERMEDIATE_COLOR="${white}"
-D_USER_COLOR="${purple}"
-D_SUPERUSER_COLOR="${red}"
-D_MACHINE_COLOR="${cyan}"
-D_DIR_COLOR="${green}"
-D_SCM_COLOR="${yellow}"
-D_BRANCH_COLOR="${yellow}"
-D_CHANGES_COLOR="${white}"
-D_CMDFAIL_COLOR="${red}"
-D_VIMSHELL_COLOR="${cyan}"
+D_DEFAULT_COLOR="${normal?}"
+D_INTERMEDIATE_COLOR="${white?}"
+D_USER_COLOR="${purple?}"
+D_SUPERUSER_COLOR="${red?}"
+D_MACHINE_COLOR="${cyan?}"
+D_DIR_COLOR="${green?}"
+D_SCM_COLOR="${yellow?}"
+D_BRANCH_COLOR="${yellow?}"
+D_CHANGES_COLOR="${white?}"
+D_CMDFAIL_COLOR="${red?}"
+D_VIMSHELL_COLOR="${cyan?}"
 
 # ------------------------------------------------------------------ FUNCTIONS
 case $TERM in
@@ -56,7 +57,7 @@ case $TERM in
 esac
 
 is_vim_shell() {
-	if [ ! -z "$VIMRUNTIME" ]; then
+	if [ -n "$VIMRUNTIME" ]; then
 		echo "${D_INTERMEDIATE_COLOR}on ${D_VIMSHELL_COLOR}\
 vim shell${D_DEFAULT_COLOR} "
 	fi
@@ -72,7 +73,7 @@ $code ${D_DEFAULT_COLOR}"
 
 # vcprompt for scm instead of bash_it default
 demula_vcprompt() {
-	if [ ! -z "$VCPROMPT_EXECUTABLE" ]; then
+	if [ -n "$VCPROMPT_EXECUTABLE" ]; then
 		local D_VCPROMPT_FORMAT="on ${D_SCM_COLOR}%s${D_INTERMEDIATE_COLOR}:\
 ${D_BRANCH_COLOR}%b %r ${D_CHANGES_COLOR}%m%u ${D_DEFAULT_COLOR}"
 		$VCPROMPT_EXECUTABLE -f "$D_VCPROMPT_FORMAT"
@@ -81,7 +82,8 @@ ${D_BRANCH_COLOR}%b %r ${D_CHANGES_COLOR}%m%u ${D_DEFAULT_COLOR}"
 
 # -------------------------------------------------------------- PROMPT OUTPUT
 prompt() {
-	local LAST_COMMAND_FAILED=$(mitsuhikos_lastcommandfailed)
+	local LAST_COMMAND_FAILED
+	LAST_COMMAND_FAILED=$(mitsuhikos_lastcommandfailed)
 	local SAVE_CURSOR='\033[s'
 	local RESTORE_CURSOR='\033[u'
 	local MOVE_CURSOR_RIGHTMOST='\033[500C'

themes/dos/dos.theme.bash

@@ -1 +1,3 @@
+# shellcheck shell=bash
+# shellcheck disable=SC2034 # Expected behavior for themes.
 PROMPT="\w>>"