From 449d6d4fe1d969a5d60ae71db1440221304dfa48 Mon Sep 17 00:00:00 2001
From: Willy Barro <wbarro@rocket-internet.com>
Date: Tue, 25 Sep 2012 17:59:45 -0300
Subject: [PATCH 001/388] Add aliases for GIT-SVN (rebase and dcommit)

- Add "gsr" for "git svn rebase"
- Add "gsd" for "git svn dcommit"
---
 aliases/available/git.aliases.bash | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index bbac313b..37cb0ab5 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -28,6 +28,10 @@ alias gdel='git branch -D'
 alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
 alias gll='git log --graph --pretty=oneline --abbrev-commit'
 
+# Git SVN
+alias gsr='git svn rebase'
+alias gsd='git svn dcommit'
+
 case $OSTYPE in
   linux*)
     alias gd='git diff | vim -R -'

From 09a48d89ccb39a3daae40688cf724b450df42c47 Mon Sep 17 00:00:00 2001
From: Levent Yalcin <leventyalcin@gmail.com>
Date: Mon, 20 May 2019 14:18:32 +0100
Subject: [PATCH 002/388] add an env var that themes can save history
 immediately

---
 themes/powerline-plain/powerline-plain.base.bash  | 2 ++
 themes/powerline-plain/powerline-plain.theme.bash | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/themes/powerline-plain/powerline-plain.base.bash b/themes/powerline-plain/powerline-plain.base.bash
index 8b881d7e..239ed3ea 100644
--- a/themes/powerline-plain/powerline-plain.base.bash
+++ b/themes/powerline-plain/powerline-plain.base.bash
@@ -14,6 +14,8 @@ function __powerline_prompt_command {
 
   LEFT_PROMPT=""
 
+  [[ $HISTORY_AUTOSAVE -eq 1 ]] && history -a && history -c && history -r
+
   ## left prompt ##
   for segment in $POWERLINE_PROMPT; do
     local info="$(__powerline_${segment}_prompt)"
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index bddb6450..59ae7b79 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -56,3 +56,5 @@ POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
 
+
+HISTORY_AUTOSAVE=${HISTORY_AUTOSAVE:-0}

From 1e10ad18139152172fa6829153a90a4d833d610b Mon Sep 17 00:00:00 2001
From: Szymon Szypulski <szymon.szypulski@gmail.com>
Date: Wed, 22 May 2019 06:54:11 +0200
Subject: [PATCH 003/388] Ignore unset and empty Kubernetes context

When current-context does not exist or is unset in $KUBECONFIG, kubectl
is throwing a message to stderr "error: current-context is not set".

Ignore it.
---
 themes/base.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 2761b632..e9e862e1 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -337,7 +337,7 @@ function ruby_version_prompt {
 }
 
 function k8s_context_prompt {
-  echo -e "$(kubectl config current-context)"
+  echo -e "$(kubectl config current-context 2> /dev/null)"
 }
 
 function virtualenv_prompt {

From 93905c3663eb1f9383dd97dd28b458f824dcdf8d Mon Sep 17 00:00:00 2001
From: Travis Swicegood <travis@domain51.com>
Date: Fri, 24 May 2019 15:10:48 -0500
Subject: [PATCH 004/388] Add gcloud completion

---
 completion/available/gcloud.bash | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 completion/available/gcloud.bash

diff --git a/completion/available/gcloud.bash b/completion/available/gcloud.bash
new file mode 100644
index 00000000..908ee9c5
--- /dev/null
+++ b/completion/available/gcloud.bash
@@ -0,0 +1,9 @@
+#/usr/bin/env bash
+# Bash completion for Google Cloud SDK
+
+if which gcloud >/dev/null 2>&1; then
+  GOOGLE_SDK_ROOT=${GOOGLE_SDK_ROOT:-$(gcloud info --format="value(installation.sdk_root)")}
+  for i in $(ls ${GOOGLE_SDK_ROOT}/*.bash.inc); do
+    source $i
+  done
+fi

From 1bdcc66d5a5fdbdcf9ee0b25124d19d19fb14527 Mon Sep 17 00:00:00 2001
From: Travis Swicegood <travis@domain51.com>
Date: Fri, 24 May 2019 15:14:13 -0500
Subject: [PATCH 005/388] Rename to .completion.bash so it can be disabled
 correctly

---
 completion/available/{gcloud.bash => gcloud.completion.bash} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename completion/available/{gcloud.bash => gcloud.completion.bash} (100%)

diff --git a/completion/available/gcloud.bash b/completion/available/gcloud.completion.bash
similarity index 100%
rename from completion/available/gcloud.bash
rename to completion/available/gcloud.completion.bash

From 371c2e9834295f46771f26cf53d6911f47e15f0b Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Fri, 31 May 2019 23:30:55 +0530
Subject: [PATCH 006/388] added sqlmap completion

---
 completion/available/sqlmap.completion.bash | 160 ++++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 completion/available/sqlmap.completion.bash

diff --git a/completion/available/sqlmap.completion.bash b/completion/available/sqlmap.completion.bash
new file mode 100644
index 00000000..3eaa538d
--- /dev/null
+++ b/completion/available/sqlmap.completion.bash
@@ -0,0 +1,160 @@
+#!/bin/bash
+
+if command -v sqlmap > /dev/null; then
+
+    _sqlmap()
+    {
+        local cur prev
+
+        COMPREPLY=()
+        cur=$(_get_cword)
+        prev=$(_get_pword)
+
+        case $prev in
+        
+    # List directory content
+    --tamper)
+        COMPREPLY=( $( compgen -W "$tamper" -- "$cur" ) )
+        return 0
+        ;;
+    --output-dir|-t|-l|-m|-r|--load-cookies|--proxy-file|--sql-file|--shared-lib|--file-write)
+        _filedir
+        return 0
+        ;;
+    -c)
+        _filedir ini
+        return 0
+        ;;
+    --method)
+        COMPREPLY=( $( compgen -W 'GET POST PUT' -- "$cur" ) )
+        return 0
+        ;;
+    --auth-type)
+        COMPREPLY=( $( compgen -W 'Basic Digest NTLM PKI' -- "$cur" ) )
+        return 0
+        ;;
+    --tor-type)
+        COMPREPLY=( $( compgen -W 'HTTP SOCKS4 SOCKS5' -- "$cur" ) )
+        return 0
+        ;;
+    -v)
+        COMPREPLY=( $( compgen -W '1 2 3 4 5 6' -- "$cur" ) )
+        return 0
+        ;;
+    --dbms)
+        COMPREPLY=( $( compgen -W 'mysql mssql access postgres' -- "$cur" ) )
+        return 0
+        ;;
+    --level|--crawl)
+        COMPREPLY=( $( compgen -W '1 2 3 4 5' -- "$cur" ) )
+        return 0
+        ;;
+    --risk)
+        COMPREPLY=( $( compgen -W '0 1 2 3' -- "$cur" ) )
+        return 0
+        ;;
+    --technique)
+        COMPREPLY=( $( compgen -W 'B E U S T Q' -- "$cur" ) )
+        return 0
+        ;;
+    -s)
+        _filedir sqlite
+        return 0
+        ;;
+    --dump-format)
+        COMPREPLY=( $( compgen -W 'CSV HTML SQLITE' -- "$cur" ) )
+        return 0
+        ;;
+    -x)
+        _filedir xml
+        return 0
+        ;;
+        esac
+
+        if [[ "$cur" == * ]]; then
+        COMPREPLY=( $( compgen -W '-h --help -hh --version -v -d -u --url -l -x -m -r -g -c --method \
+        --data --param-del --cookie --cookie-del --load-cookies \
+        --drop-set-cookie --user-agent --random-agent --host --referer \
+        --headers --auth-type --auth-cred --auth-private --ignore-401 \
+        --proxy --proxy-cred --proxy-file --ignore-proxy --tor --tor-port \
+        --tor-type --check-tor --delay --timeout --retries --randomize \
+        --safe-url --safe-freq --skip-urlencode --csrf-token --csrf-url \
+        --force-ssl --hpp --eval -o --predict-output --keep-alive \
+        --null-connection --threads -p  --skip --dbms --dbms-cred \
+        --os --invalid-bignum --invalid-logical --invalid-string \
+        --no-cast --no-escape --prefix --suffix --tamper --level \
+        --risk --string --not-string --regexp --code --text-only \
+        --titles --technique --time-sec --union-cols --union-char \
+        --union-from --dns-domain --second-order -f --fingerprint \
+        -a --all -b --banner --current-user --current-db --hostname \
+        --is-dba --users --passwords --privileges --roles --dbs --tables \
+        --columns --schema --count --dump --dump-all --search --comments \
+        -D -T -C -X -U --exclude-sysdbs --where --start --stop \
+        --first --last --sql-query --sql-shell --sql-file --common-tables \
+        --common-columns --udf-inject --shared-lib --file-read --file-write \
+        --file-dest --os-cmd --os-shell --os-pwn --os-smbrelay --os-bof \
+        --priv-esc --msf-path --tmp-path --reg-read --reg-add --reg-del \
+        --reg-key --reg-value --reg-data --reg-type -s -t --batch \
+        --charset --crawl --csv-del --dump-format --eta --flush-session \
+        --forms --fresh-queries --hex --output-dir --parse-errors \
+        --pivot-column --save --scope --test-filter --update \
+        -z --alert --answers --beep --check-waf --cleanup \
+        --dependencies --disable-coloring --gpage --identify-waf \
+        --mobile --page-rank --purge-output --smart \
+        --sqlmap-shell --wizard' -- "$cur" ) )     
+        # this removes any options from the list of completions that have
+        # already been specified somewhere on the command line, as long as
+        # these options can only be used once (in a word, "options", in
+        # opposition to "tests" and "actions", as in the find(1) manpage).
+        onlyonce=' -h --help -hh --version -v -d -u --url -l -x -m -r -g -c \
+        --drop-set-cookie --random-agent \
+        --ignore-401 \
+        --ignore-proxy --tor \
+        --check-tor \
+        --skip-urlencode \
+        --force-ssl --hpp -o --predict-output --keep-alive \
+        --null-connection -p \
+        --invalid-bignum --invalid-logical --invalid-string \
+        --no-cast --no-escape \
+        --text-only \
+        --titles \
+        -f --fingerprint \
+        -a --all -b --banner --current-user --current-db --hostname \
+        --is-dba --users --passwords --privileges --roles --dbs --tables \
+        --columns --schema --count --dump --dump-all --search --comments \
+        -D -T -C -X -U --exclude-sysdbs \
+        --sql-shell --common-tables \
+        --common-columns --udf-inject \
+        --os-shell --os-pwn --os-smbrelay --os-bof \
+        --priv-esc --reg-read --reg-add --reg-del \
+        -s -t --batch \
+        --eta --flush-session \
+        --forms --fresh-queries --hex --parse-errors \
+        --save --update \
+        -z --beep --check-waf --cleanup \
+        --dependencies --disable-coloring --identify-waf \
+        --mobile --page-rank --purge-output --smart \
+        --sqlmap-shell --wizard '
+        COMPREPLY=( $( \
+            (while read -d ' ' i; do
+                [[ -z "$i" || "${onlyonce/ ${i%% *} / }" == "$onlyonce" ]] &&
+                continue
+                # flatten array with spaces on either side,
+                # otherwise we cannot grep on word boundaries of
+                # first and last word
+                COMPREPLY=" ${COMPREPLY[@]} "
+                # remove word from list of completions
+                COMPREPLY=( ${COMPREPLY/ ${i%% *} / } )
+                done
+                printf '%s ' "${COMPREPLY[@]}") <<<"${COMP_WORDS[@]}"
+            ) )
+        
+    #    else
+    #        _filedir bat
+        fi
+    }
+
+
+    complete -F _sqlmap sqlmap
+
+fi
\ No newline at end of file

From 0ea44cb72c9bee304c3f4041ab8cb041efd66e04 Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Sun, 2 Jun 2019 14:51:01 +0530
Subject: [PATCH 007/388] added nodejs aliases

---
 aliases/available/node.aliases.bash | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 aliases/available/node.aliases.bash

diff --git a/aliases/available/node.aliases.bash b/aliases/available/node.aliases.bash
new file mode 100644
index 00000000..14bfdb8c
--- /dev/null
+++ b/aliases/available/node.aliases.bash
@@ -0,0 +1,8 @@
+cite 'about-alias'
+about-alias 'the nodejs environment aliases'
+
+# alias to setup nodejs development environment
+alias node-dev='export NODE_ENV=development'
+
+# alias to setup nodejs production environment
+alias node-prod='export NODE_ENV=production'
\ No newline at end of file

From eccda7d09b900a17d0bc1705616c4af80abe0bf1 Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Mon, 3 Jun 2019 13:04:36 +0530
Subject: [PATCH 008/388] changed to official name

---
 aliases/available/node.aliases.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aliases/available/node.aliases.bash b/aliases/available/node.aliases.bash
index 14bfdb8c..a1408f26 100644
--- a/aliases/available/node.aliases.bash
+++ b/aliases/available/node.aliases.bash
@@ -1,8 +1,8 @@
 cite 'about-alias'
-about-alias 'the nodejs environment aliases'
+about-alias 'the Node.js environment aliases'
 
 # alias to setup nodejs development environment
 alias node-dev='export NODE_ENV=development'
 
 # alias to setup nodejs production environment
-alias node-prod='export NODE_ENV=production'
\ No newline at end of file
+alias node-prod='export NODE_ENV=production'

From a111376854ca6298b4f686252e52990e7be7e3fd Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Mon, 3 Jun 2019 13:05:07 +0530
Subject: [PATCH 009/388] added eol

---
 aliases/available/node.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/node.aliases.bash b/aliases/available/node.aliases.bash
index a1408f26..ddf3c92c 100644
--- a/aliases/available/node.aliases.bash
+++ b/aliases/available/node.aliases.bash
@@ -6,3 +6,4 @@ alias node-dev='export NODE_ENV=development'
 
 # alias to setup nodejs production environment
 alias node-prod='export NODE_ENV=production'
+

From 955a9dd86d5926d5b3a1590a42926889bb7d195b Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Mon, 3 Jun 2019 14:06:05 +0530
Subject: [PATCH 010/388] added thanks message to original author

---
 completion/available/sqlmap.completion.bash | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/completion/available/sqlmap.completion.bash b/completion/available/sqlmap.completion.bash
index 3eaa538d..e80eb796 100644
--- a/completion/available/sqlmap.completion.bash
+++ b/completion/available/sqlmap.completion.bash
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# ---------------------------------------------------------------------------+
+#                                                                            |
+# Thanks to Alexander Korznikov                                                                 |
+# http://www.korznikov.com/2014/12/bash-tab-completion-for-awesome-tool.html |
+#                                                                            |        
+# ---------------------------------------------------------------------------+
+
 if command -v sqlmap > /dev/null; then
 
     _sqlmap()
@@ -157,4 +164,4 @@ if command -v sqlmap > /dev/null; then
 
     complete -F _sqlmap sqlmap
 
-fi
\ No newline at end of file
+fi

From dc61f85196d8b424f1f237a7eedb4eb2976bce32 Mon Sep 17 00:00:00 2001
From: Zhao Li <zhaoli@Kims-MacBook-Air.local>
Date: Fri, 7 Jun 2019 15:46:24 -1000
Subject: [PATCH 011/388] allow the space before SCM_GIT_AHEAD_CHAR and
 SCM_GIT_BEHIND_CHAR to be customizable

---
 themes/base.theme.bash | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index e9e862e1..79c42d1d 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -39,6 +39,7 @@ SCM_GIT_CHAR='±'
 SCM_GIT_DETACHED_CHAR='⌿'
 SCM_GIT_AHEAD_CHAR="↑"
 SCM_GIT_BEHIND_CHAR="↓"
+SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR=" "
 SCM_GIT_UNTRACKED_CHAR="?:"
 SCM_GIT_UNSTAGED_CHAR="U:"
 SCM_GIT_STAGED_CHAR="S:"
@@ -179,8 +180,8 @@ function git_prompt_vars {
   fi
 
   IFS=$'\t' read -r commits_behind commits_ahead <<< "$(_git-upstream-behind-ahead)"
-  [[ "${commits_ahead}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_AHEAD_CHAR}${commits_ahead}"
-  [[ "${commits_behind}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_BEHIND_CHAR}${commits_behind}"
+  [[ "${commits_ahead}" -gt 0 ]] && SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_AHEAD_CHAR}${commits_ahead}"
+  [[ "${commits_behind}" -gt 0 ]] && SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_BEHIND_CHAR}${commits_behind}"
 
   if [[ "${SCM_GIT_SHOW_STASH_INFO}" = "true" ]]; then
     local stash_count

From 23fab13d859acce83d5fb9b2876ec3530afd82a2 Mon Sep 17 00:00:00 2001
From: Levent Yalcin <leventyalcin@gmail.com>
Date: Mon, 10 Jun 2019 10:57:52 +0100
Subject: [PATCH 012/388] requested changes has been made.

---
 themes/powerline-plain/powerline-plain.theme.bash | 5 +----
 themes/powerline/powerline.theme.bash             | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 59ae7b79..f9538c2a 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -54,7 +54,4 @@ HOST_THEME_PROMPT_COLOR=0
 
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
 
-safe_append_prompt_command __powerline_prompt_command
-
-
-HISTORY_AUTOSAVE=${HISTORY_AUTOSAVE:-0}
+safe_append_prompt_command __powerline_prompt_command
\ No newline at end of file
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 482b3464..377e6f8e 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -57,4 +57,6 @@ HOST_THEME_PROMPT_COLOR=0
 
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
 
+HISTORY_AUTOSAVE=${HISTORY_AUTOSAVE:-0}
+
 safe_append_prompt_command __powerline_prompt_command

From e93cc67bcd3dd527f733c0eac4da64c7b5cb0110 Mon Sep 17 00:00:00 2001
From: Levent Yalcin <leventyalcin@gmail.com>
Date: Mon, 10 Jun 2019 13:39:35 +0100
Subject: [PATCH 013/388] added a function instead running the same check and
 commands in every theme

---
 themes/base.theme.bash                           | 5 +++++
 themes/powerline-plain/powerline-plain.base.bash | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 2761b632..c58aca82 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -497,3 +497,8 @@ function safe_append_prompt_command {
         fi
     fi
 }
+
+function _save-and-reload-history() {
+  local autosave=${1:-0}
+  [[ $autosave -eq 1 ]] && history -a && history -c && history -r
+}
\ No newline at end of file
diff --git a/themes/powerline-plain/powerline-plain.base.bash b/themes/powerline-plain/powerline-plain.base.bash
index 239ed3ea..5558e0eb 100644
--- a/themes/powerline-plain/powerline-plain.base.bash
+++ b/themes/powerline-plain/powerline-plain.base.bash
@@ -14,7 +14,7 @@ function __powerline_prompt_command {
 
   LEFT_PROMPT=""
 
-  [[ $HISTORY_AUTOSAVE -eq 1 ]] && history -a && history -c && history -r
+  _save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
   ## left prompt ##
   for segment in $POWERLINE_PROMPT; do

From 2cd06962d309b9a0581edae5a09924d7a88de6b4 Mon Sep 17 00:00:00 2001
From: Levent Yalcin <leventyalcin@gmail.com>
Date: Fri, 14 Jun 2019 13:57:07 +0100
Subject: [PATCH 014/388] tab completion for Hashicorp consul

---
 completion/available/consul.completion.bash | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 completion/available/consul.completion.bash

diff --git a/completion/available/consul.completion.bash b/completion/available/consul.completion.bash
new file mode 100644
index 00000000..2082e344
--- /dev/null
+++ b/completion/available/consul.completion.bash
@@ -0,0 +1,10 @@
+# bash completion support for Hashicorp consul
+
+CONSUL_BIN=$(command -v consul 2>/dev/null)
+
+if [[ -x "$CONSUL_BIN" ]]
+then
+  complete -C "$CONSUL_BIN" consul
+fi
+
+unset CONSUL_BIN
\ No newline at end of file

From e42405705a10aa6eb25d4df7f06cadf75a51c3b0 Mon Sep 17 00:00:00 2001
From: Martin Ankerl <martin.ankerl@gmail.com>
Date: Mon, 24 Jun 2019 11:02:15 +0200
Subject: [PATCH 015/388] Improved subversion support for powerline

SVN prompt also when in subdirectories that don't contain .svn
Show correct SVN status for powerline
---
 themes/base.theme.bash               | 1 +
 themes/powerline/powerline.base.bash | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index e9e862e1..efb56fb7 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -86,6 +86,7 @@ function scm {
   elif [[ -d .hg ]] && which hg &> /dev/null; then SCM=$SCM_HG
   elif which hg &> /dev/null && [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG
   elif [[ -d .svn ]] && which svn &> /dev/null; then SCM=$SCM_SVN
+  elif which svn &> /dev/null && [[ -n "$(svn info --show-item wc-root 2>/dev/null)" ]]; then SCM=$SCM_SVN
   else SCM=$SCM_NONE
   fi
 }
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index b648e2a0..9e668a6c 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -98,6 +98,8 @@ function __powerline_scm_prompt {
       scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
     elif [[ "${SCM_HG_CHAR}" == "${SCM_CHAR}" ]]; then
       scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+    elif [[ "${SCM_SVN_CHAR}" == "${SCM_CHAR}" ]]; then
+      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
     fi
     echo "$(eval "echo ${scm_prompt}")${scm}|${color}"
   fi

From 0bafdbbef9db4f60a5e701d9f82ac126571c91eb Mon Sep 17 00:00:00 2001
From: Martin Ankerl <martin.ankerl@gmail.com>
Date: Mon, 24 Jun 2019 11:28:53 +0200
Subject: [PATCH 016/388] faster subversion status

Stop as soon as "svn status" shows a change, not needed to walk through
all the changes in the whole repository. For my large repository this is
about twice as fast.

Extract just the information we need from "svn info"
---
 themes/base.theme.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index e9e862e1..7ab5f39c 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -231,7 +231,7 @@ function p4_prompt_vars {
 }
 
 function svn_prompt_vars {
-  if [[ -n $(svn status 2> /dev/null) ]]; then
+  if [[ -n $(svn status |head -c1 2> /dev/null) ]]; then
     SCM_DIRTY=1
     SCM_STATE=${SVN_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
   else
@@ -240,8 +240,8 @@ function svn_prompt_vars {
   fi
   SCM_PREFIX=${SVN_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
   SCM_SUFFIX=${SVN_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
-  SCM_BRANCH=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }') || return
-  SCM_CHANGE=$(svn info 2> /dev/null | sed -ne 's#^Revision: ##p' )
+  SCM_BRANCH=$(svn info --show-item=url 2> /dev/null | awk -F/ '{ for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }') || return
+  SCM_CHANGE=$(svn info --show-item=revision 2> /dev/null)
 }
 
 # this functions returns absolute location of .hg directory if one exists

From 7f573f24655fd70765e1d84465ee9b70b2a19d3d Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew@matthewadams.me>
Date: Wed, 26 Jun 2019 11:03:12 -0500
Subject: [PATCH 017/388] add gcpx

---
 aliases/available/git.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index d3f25425..fc95300d 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -51,6 +51,7 @@ alias gbd='git branch -d'
 alias gbD='git branch -D'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
+alias gcpx='git cherry-pick -x'
 alias gco='git checkout'
 alias gcom='git checkout master'
 alias gcb='git checkout -b'

From cf39dc42579bb562b9969dc17a0a5f7ac0ca825f Mon Sep 17 00:00:00 2001
From: Ti Leggett <ti@daleggetts.com>
Date: Thu, 4 Jul 2019 10:52:19 -0500
Subject: [PATCH 018/388] added slogin to list of ssh completion commands

---
 completion/available/ssh.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/ssh.completion.bash b/completion/available/ssh.completion.bash
index d5cd6e61..42186e81 100644
--- a/completion/available/ssh.completion.bash
+++ b/completion/available/ssh.completion.bash
@@ -37,4 +37,4 @@ _sshcomplete() {
     return 0
 }
 
-complete -o default -o nospace -F _sshcomplete ssh scp
+complete -o default -o nospace -F _sshcomplete ssh scp slogin

From ce935801a3c0d14824004c622942ec81ffa66b12 Mon Sep 17 00:00:00 2001
From: Ahmed Masud <ahmed.masud@trustifier.com>
Date: Sat, 6 Jul 2019 16:53:45 -0400
Subject: [PATCH 019/388] Fixed test of whether or not current session is
 interactive

---
 plugins/available/history.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/history.plugin.bash b/plugins/available/history.plugin.bash
index efd33981..528548ef 100644
--- a/plugins/available/history.plugin.bash
+++ b/plugins/available/history.plugin.bash
@@ -2,7 +2,7 @@ cite about-plugin
 about-plugin 'history manipulation'
 # enter a few characters and press UpArrow/DownArrow
 # to search backwards/forwards through the history
-if [ -t 1 ]
+if [[ ${SHELLOPTS} =~ (vi|emacs) ]]
 then
     bind '"":history-search-backward'
     bind '"":history-search-forward'

From 62757b0f3f327b26f7386daeb826d1d4cebd5057 Mon Sep 17 00:00:00 2001
From: Zhao Li <zhao.li@startingspark.com>
Date: Mon, 8 Jul 2019 10:52:44 -1000
Subject: [PATCH 020/388] allow the count information to be turned on or off

---
 themes/base.theme.bash | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 430fb60d..817c983d 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -33,6 +33,7 @@ SCM_GIT_IGNORE_UNTRACKED=${SCM_GIT_IGNORE_UNTRACKED:=false}
 SCM_GIT_SHOW_CURRENT_USER=${SCM_GIT_SHOW_CURRENT_USER:=false}
 SCM_GIT_SHOW_MINIMAL_INFO=${SCM_GIT_SHOW_MINIMAL_INFO:=false}
 SCM_GIT_SHOW_STASH_INFO=${SCM_GIT_SHOW_STASH_INFO:=true}
+SCM_GIT_SHOW_COMMIT_COUNT=${SCM_GIT_SHOW_COMMIT_COUNT:=true}
 
 SCM_GIT='git'
 SCM_GIT_CHAR='±'
@@ -181,8 +182,14 @@ function git_prompt_vars {
   fi
 
   IFS=$'\t' read -r commits_behind commits_ahead <<< "$(_git-upstream-behind-ahead)"
-  [[ "${commits_ahead}" -gt 0 ]] && SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_AHEAD_CHAR}${commits_ahead}"
-  [[ "${commits_behind}" -gt 0 ]] && SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_BEHIND_CHAR}${commits_behind}"
+  if [[ "${commits_ahead}" -gt 0 ]]; then
+    SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_AHEAD_CHAR}"
+    [[ "${SCM_GIT_SHOW_COMMIT_COUNT}" = "true" ]] && SCM_BRANCH+="${commits_ahead}"
+  fi
+  if [[ "${commits_behind}" -gt 0 ]]; then
+    SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_BEHIND_CHAR}"
+    [[ "${SCM_GIT_SHOW_COMMIT_COUNT}" = "true" ]] && SCM_BRANCH+="${commits_behind}"
+  fi
 
   if [[ "${SCM_GIT_SHOW_STASH_INFO}" = "true" ]]; then
     local stash_count

From 49d8c8750aed586a9f746ae47f182ac760ddceb6 Mon Sep 17 00:00:00 2001
From: Zhao Li <zhao.li@startingspark.com>
Date: Mon, 8 Jul 2019 13:28:32 -1000
Subject: [PATCH 021/388] fix broken tests

---
 test/themes/base.theme.git.bats | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/themes/base.theme.git.bats b/test/themes/base.theme.git.bats
index 4547a6e3..997b1a59 100644
--- a/test/themes/base.theme.git.bats
+++ b/test/themes/base.theme.git.bats
@@ -115,6 +115,8 @@ setup_repo_with_upstream() {
   git add file
   git stash
 
+  SCM_GIT_SHOW_STASH_INFO=true
+
   git_prompt_vars
   assert_equal "$SCM_BRANCH" "${pre} {1}"
 
@@ -320,6 +322,8 @@ setup_repo_with_upstream() {
   echo "line2" >> file1
   git add file1
 
+  SCM_GIT_SHOW_DETAILS=true
+
   git_prompt_vars
   assert_equal "$SCM_BRANCH" "${pre} S:1"
   assert_equal "$SCM_STATE" " ✗"

From 83be21ebb35bfb11d47be8b43e5bf3e3cd332b44 Mon Sep 17 00:00:00 2001
From: Zhao Li <zhao.li@startingspark.com>
Date: Mon, 8 Jul 2019 13:10:19 -1000
Subject: [PATCH 022/388] update tests to set flag appropriately

---
 test/themes/base.theme.git.bats | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/themes/base.theme.git.bats b/test/themes/base.theme.git.bats
index 4547a6e3..bae8e021 100644
--- a/test/themes/base.theme.git.bats
+++ b/test/themes/base.theme.git.bats
@@ -72,6 +72,8 @@ setup_repo_with_upstream() {
   git clone "$remote" clone
   cd clone
 
+  SCM_GIT_SHOW_COMMIT_COUNT=true
+
   git_prompt_vars
   assert_equal "$SCM_BRANCH" "${pre}"
 
@@ -146,6 +148,7 @@ setup_repo_with_upstream() {
   pushd "${repo}"
 
   SCM_GIT_SHOW_REMOTE_INFO=true
+  SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
   assert_equal "$SCM_BRANCH" "${pre}my-remote${post}"
@@ -166,6 +169,7 @@ setup_repo_with_upstream() {
   pushd "${repo}"
 
   SCM_GIT_SHOW_REMOTE_INFO=auto
+  SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
   assert_equal "$SCM_BRANCH" "${pre}${post}"
@@ -202,6 +206,7 @@ setup_repo_with_upstream() {
   git remote add third-remote "$(mktemp -d)"
 
   SCM_GIT_SHOW_REMOTE_INFO=false
+  SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
   assert_equal "$SCM_BRANCH" "${pre}${post}"
@@ -223,6 +228,7 @@ setup_repo_with_upstream() {
   pushd "${repo}"
 
   SCM_GIT_SHOW_REMOTE_INFO=true
+  SCM_GIT_SHOW_COMMIT_COUNT=true
 
   git_prompt_vars
   assert_equal "$SCM_BRANCH" "${pre} → my-remote${post}"

From 33239845940dbe616d3c250ad622b404a0295aa3 Mon Sep 17 00:00:00 2001
From: Lowie Huyghe <iam@lowiehuyghe.com>
Date: Mon, 22 Jul 2019 16:42:29 +0200
Subject: [PATCH 023/388] Completely ignore enabled-dir in root to support
 symlinking.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6fad6279..a17b6e82 100755
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ bats
 *.sublime-workspace
 *.sublime-project
 enabled/*
+/enabled
 tmp/

From 4c0a51aee25238f8db32271a51958f2cf358ef80 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Mon, 15 Jul 2019 09:31:16 -0300
Subject: [PATCH 024/388] Optimize SCM checks

---
 themes/base.theme.bash | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 430fb60d..e172dd0c 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -79,15 +79,20 @@ RBENV_THEME_PROMPT_SUFFIX='|'
 RBFU_THEME_PROMPT_PREFIX=' |'
 RBFU_THEME_PROMPT_SUFFIX='|'
 
+GIT_EXE=`which git 2> /dev/null || true`
+P4_EXE=`which p4 2> /dev/null || true`
+HG_EXE=`which hg  2> /dev/null || true`
+SVN_EXE=`which svn  2> /dev/null || true`
+
 function scm {
   if [[ "$SCM_CHECK" = false ]]; then SCM=$SCM_NONE
-  elif [[ -f .git/HEAD ]] && which git &> /dev/null; then SCM=$SCM_GIT
-  elif which git &> /dev/null && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then SCM=$SCM_GIT
-  elif which p4 &> /dev/null && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then SCM=$SCM_P4
-  elif [[ -d .hg ]] && which hg &> /dev/null; then SCM=$SCM_HG
-  elif which hg &> /dev/null && [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG
-  elif [[ -d .svn ]] && which svn &> /dev/null; then SCM=$SCM_SVN
-  elif which svn &> /dev/null && [[ -n "$(svn info --show-item wc-root 2>/dev/null)" ]]; then SCM=$SCM_SVN
+  elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then SCM=$SCM_GIT
+  elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then SCM=$SCM_GIT
+  elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then SCM=$SCM_P4
+  elif [[ -d .hg ]] && [[ -x "$HG_EXE" ]]; then SCM=$SCM_HG
+  elif [[ -x "$HG_EXE" ]] && [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG
+  elif [[ -d .svn ]] && [[ -x "$SVN_EXE" ]]; then SCM=$SCM_SVN
+  elif [[ -x "$SVN_EXE" ]] && [[ -n "$(svn info --show-item wc-root 2>/dev/null)" ]]; then SCM=$SCM_SVN
   else SCM=$SCM_NONE
   fi
 }
@@ -503,4 +508,4 @@ function safe_append_prompt_command {
 function _save-and-reload-history() {
   local autosave=${1:-0}
   [[ $autosave -eq 1 ]] && history -a && history -c && history -r
-}
\ No newline at end of file
+}

From ef31690b07977e1cd5b9902fc37037858ea6bcd1 Mon Sep 17 00:00:00 2001
From: Arunvel Sriram <arunvelsriram@gmail.com>
Date: Sat, 27 Jul 2019 22:50:08 +0530
Subject: [PATCH 025/388] Add helper function to add all ssh private keys to
 agent

---
 plugins/available/ssh.plugin.bash | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/available/ssh.plugin.bash b/plugins/available/ssh.plugin.bash
index f670b98c..51587b29 100644
--- a/plugins/available/ssh.plugin.bash
+++ b/plugins/available/ssh.plugin.bash
@@ -17,3 +17,10 @@ function sshlist() {
 
   awk '$1 ~ /Host$/ {for (i=2; i<=NF; i++) print $i}' ~/.ssh/config
 }
+
+function ssh-add-all() {
+  about 'add all ssh private keys to agent'
+  group 'ssh'
+
+  grep -slR "PRIVATE" ~/.ssh | xargs ssh-add
+}

From 12c49bd22fc1f1cbe9d48bc969661b0abaffe5d3 Mon Sep 17 00:00:00 2001
From: Martin Lariz <mlariz@proofpoint.com>
Date: Mon, 29 Jul 2019 07:07:58 -0700
Subject: [PATCH 026/388] Remove errors if plugin executable not available

---
 plugins/available/node.plugin.bash  | 2 +-
 plugins/available/pyenv.plugin.bash | 2 +-
 plugins/available/rbenv.plugin.bash | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/available/node.plugin.bash b/plugins/available/node.plugin.bash
index f0467cef..597875ee 100644
--- a/plugins/available/node.plugin.bash
+++ b/plugins/available/node.plugin.bash
@@ -4,4 +4,4 @@ about-plugin 'Node.js helper functions'
 pathmunge ./node_modules/.bin
 
 # Make sure the global npm prefix is on the path
-[[ `which npm` ]] && pathmunge $(npm config get prefix)/bin
+[[ `which npm 2>/dev/null` ]] && pathmunge $(npm config get prefix)/bin
diff --git a/plugins/available/pyenv.plugin.bash b/plugins/available/pyenv.plugin.bash
index dced31a8..4d8db4fb 100644
--- a/plugins/available/pyenv.plugin.bash
+++ b/plugins/available/pyenv.plugin.bash
@@ -4,7 +4,7 @@ about-plugin 'load pyenv, if you are using it'
 export PYENV_ROOT="$HOME/.pyenv"
 pathmunge "$PYENV_ROOT/bin"
 
-[[ `which pyenv` ]] && eval "$(pyenv init - bash)"
+[[ `which pyenv 2>/dev/null` ]] && eval "$(pyenv init - bash)"
 
 #Load pyenv virtualenv if the virtualenv plugin is installed.
 if pyenv virtualenv-init - &> /dev/null; then
diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash
index ecba0c89..2b01669d 100644
--- a/plugins/available/rbenv.plugin.bash
+++ b/plugins/available/rbenv.plugin.bash
@@ -4,4 +4,4 @@ about-plugin 'load rbenv, if you are using it'
 export RBENV_ROOT="$HOME/.rbenv"
 pathmunge "$RBENV_ROOT/bin"
 
-[[ `which rbenv` ]] && eval "$(rbenv init - bash)"
+[[ `which rbenv 2>/dev/null` ]] && eval "$(rbenv init - bash)"

From 9735ad7b5ce4cf39567d025d2136d05f0fa3f3ad Mon Sep 17 00:00:00 2001
From: Brandon Waskiewicz <brandon.waskiewicz@gmail.com>
Date: Mon, 29 Jul 2019 14:07:34 -0400
Subject: [PATCH 027/388] Ensure node paths are appended to existing $PATH

---
 plugins/available/node.plugin.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/available/node.plugin.bash b/plugins/available/node.plugin.bash
index f0467cef..b012742d 100644
--- a/plugins/available/node.plugin.bash
+++ b/plugins/available/node.plugin.bash
@@ -1,7 +1,7 @@
 cite about-plugin
 about-plugin 'Node.js helper functions'
 
-pathmunge ./node_modules/.bin
+pathmunge "./node_modules/.bin" "after"
 
 # Make sure the global npm prefix is on the path
-[[ `which npm` ]] && pathmunge $(npm config get prefix)/bin
+[[ `which npm` ]] && pathmunge "$(npm config get prefix)/bin" "after"

From 1de985c460e152831f64a7e1e2c37c40d741b8e8 Mon Sep 17 00:00:00 2001
From: Jacob Hrbek <werifgx@gmail.com>
Date: Tue, 30 Jul 2019 11:09:17 +0200
Subject: [PATCH 028/388] themes/agnoster : initial

Initial commit of agnoster theme.

Credit: Isaac "Agnoster" Wolkerstorfer https://github.com/agnoster
- original creator

Credit: Kenny Root https://gist.github.com/kruton/8345450 coverted from
zsh to bash

Credit: Toan Nguyen https://github.com/nntoan published in
ohmybash/oh-my-bash (https://github.com/ohmybash/oh-my-bash)

Credit: https://github.com/speedenator patch for kruton's work and
maintainance.

Credit: Hanish K H Updated & fixed on oct-05-2017
---
 themes/agnoster/agnoster.theme.bash | 423 ++++++++++++++++++++++++++++
 1 file changed, 423 insertions(+)
 create mode 100644 themes/agnoster/agnoster.theme.bash

diff --git a/themes/agnoster/agnoster.theme.bash b/themes/agnoster/agnoster.theme.bash
new file mode 100644
index 00000000..dae991cf
--- /dev/null
+++ b/themes/agnoster/agnoster.theme.bash
@@ -0,0 +1,423 @@
+#!/usr/bin/env bash
+# vim: ft=bash ts=2 sw=2 sts=2
+#
+# agnoster's Theme - https://gist.github.com/3712874
+# A Powerline-inspired theme for BASH
+#
+# (Converted from ZSH theme by Kenny Root)
+# https://gist.github.com/kruton/8345450
+#
+# Updated & fixed by Erik Selberg erik@selberg.org 1/14/17
+# Tested on MacOSX, Ubuntu, Amazon Linux
+# Bash v3 and v4
+#
+# # README
+#
+# In order for this theme to render correctly, you will need a
+# [Powerline-patched font](https://gist.github.com/1595572).
+# I recommend: https://github.com/powerline/fonts.git
+# > git clone https://github.com/powerline/fonts.git fonts
+# > cd fonts
+# > install.sh
+
+# In addition, I recommend the
+# [Solarized theme](https://github.com/altercation/solarized/) and, if you're
+# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
+# it has significantly better color fidelity.
+
+# Install:
+
+# I recommend the following:
+# $ cd home
+# $ mkdir -p .bash/themes/agnoster-bash
+# $ git clone https://github.com/speedenator/agnoster-bash.git .bash/themes/agnoster-bash
+
+# then add the following to your .bashrc:
+
+# export THEME=$HOME/.bash/themes/agnoster-bash/agnoster.bash
+# if [[ -f $THEME ]]; then
+#     export DEFAULT_USER=`whoami`
+#     source $THEME
+# fi
+
+#
+# # Goals
+#
+# The aim of this theme is to only show you *relevant* information. Like most
+# prompts, it will only show git information when in a git working directory.
+# However, it goes a step further: everything from the current user and
+# hostname to whether the last call exited with an error to whether background
+# jobs are running in this shell will all be displayed automatically when
+# appropriate.
+
+# Generally speaking, this script has limited support for right
+# prompts (ala powerlevel9k on zsh), but it's pretty problematic in Bash.
+# The general pattern is to write out the right prompt, hit \r, then
+# write the left. This is problematic for the following reasons:
+# - Doesn't properly resize dynamically when you resize the terminal
+# - Changes to the prompt (like clearing and re-typing, super common) deletes the prompt
+# - Getting the right alignment via columns / tput cols is pretty problematic (and is a bug in this version)
+# - Bash prompt escapes (like \h or \w) don't get interpolated
+#
+# all in all, if you really, really want right-side prompts without a
+# ton of work, recommend going to zsh for now. If you know how to fix this,
+# would appreciate it!
+
+# note: requires bash v4+... Mac users - you often have bash3.
+# 'brew install bash' will set you free
+PROMPT_DIRTRIM=2 # bash4 and above
+
+######################################################################
+DEBUG=0
+debug() {
+    if [[ ${DEBUG} -ne 0 ]]; then
+        >&2 echo -e $*
+    fi
+}
+
+######################################################################
+### Segment drawing
+# A few utility functions to make it easy and re-usable to draw segmented prompts
+
+CURRENT_BG='NONE'
+CURRENT_RBG='NONE'
+SEGMENT_SEPARATOR=''
+RIGHT_SEPARATOR=''
+LEFT_SUBSEG=''
+RIGHT_SUBSEG=''
+
+text_effect() {
+    case "$1" in
+        reset)      echo 0;;
+        bold)       echo 1;;
+        underline)  echo 4;;
+    esac
+}
+
+# to add colors, see
+# http://bitmote.com/index.php?post/2012/11/19/Using-ANSI-Color-Codes-to-Colorize-Your-Bash-Prompt-on-Linux
+# under the "256 (8-bit) Colors" section, and follow the example for orange below
+fg_color() {
+    case "$1" in
+        black)      echo 30;;
+        red)        echo 31;;
+        green)      echo 32;;
+        yellow)     echo 33;;
+        blue)       echo 34;;
+        magenta)    echo 35;;
+        cyan)       echo 36;;
+        white)      echo 37;;
+        orange)     echo 38\;5\;166;;
+    esac
+}
+
+bg_color() {
+    case "$1" in
+        black)      echo 40;;
+        red)        echo 41;;
+        green)      echo 42;;
+        yellow)     echo 43;;
+        blue)       echo 44;;
+        magenta)    echo 45;;
+        cyan)       echo 46;;
+        white)      echo 47;;
+        orange)     echo 48\;5\;166;;
+    esac;
+}
+
+# TIL: declare is global not local, so best use a different name
+# for codes (mycodes) as otherwise it'll clobber the original.
+# this changes from BASH v3 to BASH v4.
+ansi() {
+    local seq
+    declare -a mycodes=("${!1}")
+
+    debug "ansi: ${!1} all: $* aka ${mycodes[@]}"
+
+    seq=""
+    for ((i = 0; i < ${#mycodes[@]}; i++)); do
+        if [[ -n $seq ]]; then
+            seq="${seq};"
+        fi
+        seq="${seq}${mycodes[$i]}"
+    done
+    debug "ansi debug:" '\\[\\033['${seq}'m\\]'
+    echo -ne '\[\033['${seq}'m\]'
+    # PR="$PR\[\033[${seq}m\]"
+}
+
+ansi_single() {
+    echo -ne '\[\033['$1'm\]'
+}
+
+# Begin a segment
+# Takes two arguments, background and foreground. Both can be omitted,
+# rendering default background/foreground.
+prompt_segment() {
+    local bg fg
+    declare -a codes
+
+    debug "Prompting $1 $2 $3"
+
+    # if commented out from kruton's original... I'm not clear
+    # if it did anything, but it messed up things like
+    # prompt_status - Erik 1/14/17
+
+    #    if [[ -z $1 || ( -z $2 && $2 != default ) ]]; then
+    codes=("${codes[@]}" $(text_effect reset))
+    #    fi
+    if [[ -n $1 ]]; then
+        bg=$(bg_color $1)
+        codes=("${codes[@]}" $bg)
+        debug "Added $bg as background to codes"
+    fi
+    if [[ -n $2 ]]; then
+        fg=$(fg_color $2)
+        codes=("${codes[@]}" $fg)
+        debug "Added $fg as foreground to codes"
+    fi
+
+    debug "Codes: "
+    # declare -p codes
+
+    if [[ $CURRENT_BG != NONE && $1 != $CURRENT_BG ]]; then
+        declare -a intermediate=($(fg_color $CURRENT_BG) $(bg_color $1))
+        debug "pre prompt " $(ansi intermediate[@])
+        PR="$PR $(ansi intermediate[@])$SEGMENT_SEPARATOR"
+        debug "post prompt " $(ansi codes[@])
+        PR="$PR$(ansi codes[@]) "
+    else
+        debug "no current BG, codes is $codes[@]"
+        PR="$PR$(ansi codes[@]) "
+    fi
+    CURRENT_BG=$1
+    [[ -n $3 ]] && PR="$PR$3"
+}
+
+# End the prompt, closing any open segments
+prompt_end() {
+    if [[ -n $CURRENT_BG ]]; then
+        declare -a codes=($(text_effect reset) $(fg_color $CURRENT_BG))
+        PR="$PR $(ansi codes[@])$SEGMENT_SEPARATOR"
+    fi
+    declare -a reset=($(text_effect reset))
+    PR="$PR $(ansi reset[@])"
+    CURRENT_BG=''
+}
+
+### virtualenv prompt
+prompt_virtualenv() {
+    if [[ -n $VIRTUAL_ENV ]]; then
+        color=cyan
+        prompt_segment $color $PRIMARY_FG
+        prompt_segment $color white "$(basename $VIRTUAL_ENV)"
+    fi
+}
+
+
+### Prompt components
+# Each component will draw itself, and hide itself if no information needs to be shown
+
+# Context: user@hostname (who am I and where am I)
+prompt_context() {
+    local user=`whoami`
+
+    if [[ $user != $DEFAULT_USER || -n $SSH_CLIENT ]]; then
+        prompt_segment black default "$user@\h"
+    fi
+}
+
+# prints history followed by HH:MM, useful for remembering what
+# we did previously
+prompt_histdt() {
+    prompt_segment black default "\! [\A]"
+}
+
+
+git_status_dirty() {
+    dirty=$(git status -s 2> /dev/null | tail -n 1)
+    [[ -n $dirty ]] && echo " ●"
+}
+
+# Git: branch/detached head, dirty status
+prompt_git() {
+    local ref dirty
+    if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+        ZSH_THEME_GIT_PROMPT_DIRTY='±'
+        dirty=$(git_status_dirty)
+        ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+        if [[ -n $dirty ]]; then
+            prompt_segment yellow black
+        else
+            prompt_segment green black
+        fi
+        PR="$PR${ref/refs\/heads\// }$dirty"
+    fi
+}
+
+# Dir: current working directory
+prompt_dir() {
+    prompt_segment blue black '\w'
+}
+
+# Status:
+# - was there an error
+# - am I root
+# - are there background jobs?
+prompt_status() {
+    local symbols
+    symbols=()
+    [[ $RETVAL -ne 0 ]] && symbols+="$(ansi_single $(fg_color red))✘"
+    [[ $UID -eq 0 ]] && symbols+="$(ansi_single $(fg_color yellow))⚡"
+    [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="$(ansi_single $(fg_color cyan))⚙"
+
+    [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
+}
+
+######################################################################
+#
+# experimental right prompt stuff
+# requires setting prompt_foo to use PRIGHT vs PR
+# doesn't quite work per above
+
+rightprompt() {
+    printf "%*s" $COLUMNS "$PRIGHT"
+}
+
+# quick right prompt I grabbed to test things.
+__command_rprompt() {
+    local times= n=$COLUMNS tz
+    for tz in ZRH:Europe/Zurich PIT:US/Eastern \
+              MTV:US/Pacific TOK:Asia/Tokyo; do
+        [ $n -gt 40 ] || break
+        times="$times ${tz%%:*}\e[30;1m:\e[0;36;1m"
+        times="$times$(TZ=${tz#*:} date +%H:%M)\e[0m"
+        n=$(( $n - 10 ))
+    done
+    [ -z "$times" ] || printf "%${n}s$times\\r" ''
+}
+# PROMPT_COMMAND=__command_rprompt
+
+# this doens't wrap code in \[ \]
+ansi_r() {
+    local seq
+    declare -a mycodes2=("${!1}")
+
+    debug "ansi: ${!1} all: $* aka ${mycodes2[@]}"
+
+    seq=""
+    for ((i = 0; i < ${#mycodes2[@]}; i++)); do
+        if [[ -n $seq ]]; then
+            seq="${seq};"
+        fi
+        seq="${seq}${mycodes2[$i]}"
+    done
+    debug "ansi debug:" '\\[\\033['${seq}'m\\]'
+    echo -ne '\033['${seq}'m'
+    # PR="$PR\[\033[${seq}m\]"
+}
+
+# Begin a segment on the right
+# Takes two arguments, background and foreground. Both can be omitted,
+# rendering default background/foreground.
+prompt_right_segment() {
+    local bg fg
+    declare -a codes
+
+    debug "Prompt right"
+    debug "Prompting $1 $2 $3"
+
+    # if commented out from kruton's original... I'm not clear
+    # if it did anything, but it messed up things like
+    # prompt_status - Erik 1/14/17
+
+    #    if [[ -z $1 || ( -z $2 && $2 != default ) ]]; then
+    codes=("${codes[@]}" $(text_effect reset))
+    #    fi
+    if [[ -n $1 ]]; then
+        bg=$(bg_color $1)
+        codes=("${codes[@]}" $bg)
+        debug "Added $bg as background to codes"
+    fi
+    if [[ -n $2 ]]; then
+        fg=$(fg_color $2)
+        codes=("${codes[@]}" $fg)
+        debug "Added $fg as foreground to codes"
+    fi
+
+    debug "Right Codes: "
+    # declare -p codes
+
+    # right always has a separator
+    # if [[ $CURRENT_RBG != NONE && $1 != $CURRENT_RBG ]]; then
+    #     $CURRENT_RBG=
+    # fi
+    declare -a intermediate2=($(fg_color $1) $(bg_color $CURRENT_RBG) )
+    # PRIGHT="$PRIGHT---"
+    debug "pre prompt " $(ansi_r intermediate2[@])
+    PRIGHT="$PRIGHT$(ansi_r intermediate2[@])$RIGHT_SEPARATOR"
+    debug "post prompt " $(ansi_r codes[@])
+    PRIGHT="$PRIGHT$(ansi_r codes[@]) "
+    # else
+    #     debug "no current BG, codes is $codes[@]"
+    #     PRIGHT="$PRIGHT$(ansi codes[@]) "
+    # fi
+    CURRENT_RBG=$1
+    [[ -n $3 ]] && PRIGHT="$PRIGHT$3"
+}
+
+######################################################################
+## Emacs prompt --- for dir tracking
+# stick the following in your .emacs if you use this:
+
+# (setq dirtrack-list '(".*DIR *\\([^ ]*\\) DIR" 1 nil))
+# (defun dirtrack-filter-out-pwd-prompt (string)
+#   "dirtrack-mode doesn't remove the PWD match from the prompt.  This does."
+#   ;; TODO: support dirtrack-mode's multiline regexp.
+#   (if (and (stringp string) (string-match (first dirtrack-list) string))
+#       (replace-match "" t t string 0)
+#     string))
+# (add-hook 'shell-mode-hook
+#           #'(lambda ()
+#               (dirtrack-mode 1)
+#               (add-hook 'comint-preoutput-filter-functions
+#                         'dirtrack-filter-out-pwd-prompt t t)))
+
+prompt_emacsdir() {
+    # no color or other setting... this will be deleted per above
+    PR="DIR \w DIR$PR"
+}
+
+######################################################################
+## Main prompt
+
+build_prompt() {
+    [[ ! -z ${AG_EMACS_DIR+x} ]] && prompt_emacsdir
+    prompt_status
+    #[[ -z ${AG_NO_HIST+x} ]] && prompt_histdt
+    [[ -z ${AG_NO_CONTEXT+x} ]] && prompt_context
+    prompt_virtualenv
+    prompt_dir
+    prompt_git
+    prompt_end
+}
+
+# from orig...
+# export PS1='$(ansi_single $(text_effect reset)) $(build_prompt) '
+# this doesn't work... new model: create a prompt via a PR variable and
+# use that.
+
+set_bash_prompt() {
+    RETVAL=$?
+    PR=""
+    PRIGHT=""
+    CURRENT_BG=NONE
+    PR="$(ansi_single $(text_effect reset))"
+    build_prompt
+
+    # uncomment below to use right prompt
+    #     PS1='\[$(tput sc; printf "%*s" $COLUMNS "$PRIGHT"; tput rc)\]'$PR
+    PS1=$PR
+}
+
+PROMPT_COMMAND=set_bash_prompt

From f29a195f49be108595ff41e858af70c3821ca7d7 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Wed, 31 Jul 2019 08:49:20 +0200
Subject: [PATCH 029/388] Make sed replacements work for both BSD and GNU sed

Fixes #1411
---
 lib/helpers.bash                    | 10 ++++++++++
 plugins/available/proxy.plugin.bash |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 3a47cd4a..e7ef15ba 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -5,6 +5,16 @@ BASH_IT_LOAD_PRIORITY_DEFAULT_PLUGIN=${BASH_IT_LOAD_PRIORITY_DEFAULT_PLUGIN:-250
 BASH_IT_LOAD_PRIORITY_DEFAULT_COMPLETION=${BASH_IT_LOAD_PRIORITY_DEFAULT_COMPLETION:-350}
 BASH_IT_LOAD_PRIORITY_SEPARATOR="---"
 
+# Handle the different ways of running `sed` without generating a backup file based on OS
+# - GNU sed (Linux) uses `-i`
+# - BSD sed (macOS) uses `-i ''`
+# To use this in Bash-it for inline replacements with `sed`, use the following syntax:
+# sed "${BASH_IT_SED_I_PARAMETERS[@]}" -e "..." file
+BASH_IT_SED_I_PARAMETERS=(-i)
+case "$(uname)" in
+  Darwin*) BASH_IT_SED_I_PARAMETERS=(-i "")
+esac
+
 function _command_exists ()
 {
   _about 'checks for existence of a command'
diff --git a/plugins/available/proxy.plugin.bash b/plugins/available/proxy.plugin.bash
index 4f4bcbac..afd4dba4 100644
--- a/plugins/available/proxy.plugin.bash
+++ b/plugins/available/proxy.plugin.bash
@@ -370,7 +370,7 @@ ssh-disable-proxy ()
 	group 'proxy'
 
 	if [ -f ~/.ssh/config ] ; then
-		sed -e's/^.*ProxyCommand/#	ProxyCommand/' -i ""  ~/.ssh/config
+		sed -e's/^.*ProxyCommand/#	ProxyCommand/' "${BASH_IT_SED_I_PARAMETERS[@]}"  ~/.ssh/config
 		echo "Disabled SSH config proxy settings"
 	fi
 }
@@ -382,7 +382,7 @@ ssh-enable-proxy ()
 	group 'proxy'
 
 	if [ -f ~/.ssh/config ] ; then
-		sed -e's/#	ProxyCommand/	ProxyCommand/' -i ""  ~/.ssh/config
+		sed -e's/#	ProxyCommand/	ProxyCommand/' "${BASH_IT_SED_I_PARAMETERS[@]}"  ~/.ssh/config
 		echo "Enabled SSH config proxy settings"
 	fi
 }

From c4d03f2407016bfac08f896493d3c24c5b8aa9c7 Mon Sep 17 00:00:00 2001
From: Zhao Li <zhao.li@startingspark.com>
Date: Fri, 30 Aug 2019 15:37:17 -1000
Subject: [PATCH 030/388] note how to use toggle flag in README

---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 13a991da..92b6465d 100644
--- a/README.md
+++ b/README.md
@@ -329,6 +329,19 @@ Set `SCM_GIT_SHOW_STASH_INFO` to 'false' to **don't show** it:
 
 * `export SCM_GIT_SHOW_STASH_INFO=false`
 
+### Ahead/Behind Count
+
+When displaying information regarding whether or not the local branch is ahead or behind it's remote counterpart, you can opt to display the number of commits ahead/behind.
+This is useful if you only care whether or not you are ahead or behind and do not care how far ahead/behind you are.
+
+Set `SCM_GIT_SHOW_COMMIT_COUNT` to 'true' (the default value) to **show** the count of commits ahead/behind:
+
+* `export SCM_GIT_SHOW_COMMIT_COUNT=true`
+
+Set `SCM_GIT_SHOW_COMMIT_COUNT` to 'false' to **don't show** it:
+
+* `export SCM_GIT_SHOW_COMMIT_COUNT=false`
+
 ### Git user
 
 In some environments, it is useful to know the value of the current git user, which is used to mark all new commits.

From a0af4f40cd72f5cc39ac3139c674a801f34056bf Mon Sep 17 00:00:00 2001
From: Stefano Cislaghi <stefano.cislaghi@aexp.com>
Date: Mon, 2 Sep 2019 11:40:51 +0100
Subject: [PATCH 031/388] Added proxy exceptions (noproxy) for npm

---
 plugins/available/proxy.plugin.bash | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/available/proxy.plugin.bash b/plugins/available/proxy.plugin.bash
index afd4dba4..f2458e3f 100644
--- a/plugins/available/proxy.plugin.bash
+++ b/plugins/available/proxy.plugin.bash
@@ -121,6 +121,7 @@ npm-show-proxy ()
 		echo "==="
 		echo "npm HTTP  proxy: " `npm config get proxy`
 		echo "npm HTTPS proxy: " `npm config get https-proxy`
+		echo "npm proxy exceptions: " `npm config get noproxy`
 	fi
 }
 
@@ -132,6 +133,7 @@ npm-disable-proxy ()
 	if $(command -v npm &> /dev/null) ; then
 		npm config delete proxy
 		npm config delete https-proxy
+		npm config delete noproxy
 		echo "Disabled npm proxy settings"
 	fi
 }
@@ -143,10 +145,12 @@ npm-enable-proxy ()
 
 	local my_http_proxy=${1:-$BASH_IT_HTTP_PROXY}
 	local my_https_proxy=${2:-$BASH_IT_HTTPS_PROXY}
+	local my_no_proxy=${3:-$BASH_IT_NO_PROXY}
 
 	if $(command -v npm &> /dev/null) ; then
 		npm config set proxy $my_http_proxy
 		npm config set https-proxy $my_https_proxy
+		npm config set noproxy $my_no_proxy
 		echo "Enabled npm proxy settings"
 	fi
 }

From 4b2812cbdf3872e8f9f64fff659d29a70b70208f Mon Sep 17 00:00:00 2001
From: Stanko <stanko.tadic@gmail.com>
Date: Fri, 13 Sep 2019 10:57:01 +0200
Subject: [PATCH 032/388] Trivial fix for clean theme

---
 themes/clean/clean.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/clean/clean.theme.bash b/themes/clean/clean.theme.bash
index c479a041..0082d671 100644
--- a/themes/clean/clean.theme.bash
+++ b/themes/clean/clean.theme.bash
@@ -13,7 +13,7 @@ function prompt_command() {
 
     if [ "$(whoami)" = root ]; then no_color=$red; else no_color=$white; fi
 
-    PS1="${no_color}\u${reset_color}:${blue}\W/${reset_color} \[$(scm_prompt_info)\]${normal}$ "
+    PS1="${no_color}\u${reset_color}:${blue}\W/${reset_color} $(scm_prompt_info)${normal}$ "
 }
 
 safe_append_prompt_command prompt_command

From 92d7e29125454a60953e4a977f245403418a27ac Mon Sep 17 00:00:00 2001
From: Mattia Rigotti <mrigotti@us.ibm.com>
Date: Fri, 27 Sep 2019 14:22:01 -0400
Subject: [PATCH 033/388] Add theme/sexy-python, a modified version of sexy
 which shows in which virtualenv or condaenv you are

---
 themes/sexy-python/sexy-python.theme.bash | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 themes/sexy-python/sexy-python.theme.bash

diff --git a/themes/sexy-python/sexy-python.theme.bash b/themes/sexy-python/sexy-python.theme.bash
new file mode 100644
index 00000000..e472218a
--- /dev/null
+++ b/themes/sexy-python/sexy-python.theme.bash
@@ -0,0 +1,46 @@
+# Small modification of Sexy Bash Prompt to include virtualenv and condaenv prompts
+# (Sexy Bash Prompt is inspired by "Extravagant Zsh Prompt"
+# with big thanks to \amethyst on Freenode)
+
+if tput setaf 1 &> /dev/null; then
+    if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
+      MAGENTA=$(tput setaf 9)
+      ORANGE=$(tput setaf 172)
+      GREEN=$(tput setaf 190)
+      PURPLE=$(tput setaf 141)
+      WHITE=$(tput setaf 0)
+    else
+      MAGENTA=$(tput setaf 5)
+      ORANGE=$(tput setaf 4)
+      GREEN=$(tput setaf 2)
+      PURPLE=$(tput setaf 1)
+      WHITE=$(tput setaf 7)
+    fi
+    BOLD=$(tput bold)
+    RESET=$(tput sgr0)
+else
+    MAGENTA="\033[1;31m"
+    ORANGE="\033[1;33m"
+    GREEN="\033[1;32m"
+    PURPLE="\033[1;35m"
+    WHITE="\033[1;37m"
+    BOLD=""
+    RESET="\033[m"
+fi
+
+parse_git_dirty () {
+  [[ $(git status 2> /dev/null | tail -n1 | cut -c 1-17) != "nothing to commit" ]] && echo "*"
+}
+parse_git_branch () {
+  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/"
+}
+
+env_prompt () {
+    echo -e "($(virtualenv_prompt)$(condaenv_prompt))"
+}
+
+function prompt_command() {
+    PS1="\[${BOLD}${WHITE}\]$(env_prompt) \[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
+}
+
+safe_append_prompt_command prompt_command

From 1224fbb0fab3814c4161c29952ba910809773182 Mon Sep 17 00:00:00 2001
From: Jonathan Lao-kan <oneofdays@gmail.com>
Date: Thu, 3 Oct 2019 22:05:53 +0200
Subject: [PATCH 034/388] Improve grammar in README

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 92b6465d..ccaa7946 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 Includes autocompletion, themes, aliases, custom functions, a few stolen pieces from Steve Losh, and more.
 
 Bash-it provides a solid framework for using, developing and maintaining shell scripts and custom commands for your daily work.
-If you're using the _Bourne Again Shell_ (Bash) on a regular basis and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!
+If you're using the _Bourne Again Shell_ (Bash) regularly and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!
 Stop polluting your `~/bin` directory and your `.bashrc` file, fork/clone Bash-it and start hacking away.
 
 - [Contributing](#contributing)
@@ -58,7 +58,7 @@ Feel free to enable the tools you want to use after the installation.
 When you run without the `--no-modify-config` switch, the Bash-it installer automatically modifies/replaces your existing config file.
 Use the `--no-modify-config` switch to avoid unwanted modifications, e.g. if your Bash config file already contains the code that loads Bash-it.
 
-**NOTE**: Keep in mind how Bash load its configuration files,
+**NOTE**: Keep in mind how Bash loads its configuration files,
 `.bash_profile` for login shells (and in macOS in terminal emulators like [Terminal.app](http://www.apple.com/osx/apps/) or
 [iTerm2](https://www.iterm2.com/)) and `.bashrc` for interactive shells (default mode in most of the GNU/Linux terminal emulators),
 to ensure that Bash-it is loaded correctly.
@@ -77,7 +77,7 @@ Refer to the official [Bash documentation](https://www.gnu.org/software/bash/man
 ### Install using Docker
 
 You can try Bash-it in an isolated environment without changing any local files via a [Docker](https://www.docker.com/) Container.
-(Bash Shell v4.4 with Bash-it, [bats](https://github.com/sstephenson/bats) and bash-completion based on [Alpine Linux](https://alpinelinux.org/)).
+(Bash Shell v4.4 with Bash-it, [bats](https://github.com/sstephenson/bats),and bash-completion based on [Alpine Linux](https://alpinelinux.org/)).
 
 `docker pull ellerbrock/bash-it`
 
@@ -206,7 +206,7 @@ export BASH_IT_THEME=""
 
 You can easily preview the themes in your own shell using `BASH_PREVIEW=true bash-it reload`.
 
-If you've created your own custom prompts, we'd love it if you shared with everyone else! Just submit a Pull Request.
+If you've created your own custom prompts, we'd love it if you shared them with everyone else! Just submit a Pull Request.
 You can see theme screenshots on [wiki/Themes](https://github.com/Bash-it/bash-it/wiki/Themes).
 
 **NOTE**: Bash-it and some themes use UTF-8 characters, so to avoid strange behavior in your terminal, set your locale to `LC_ALL=en_US.UTF-8` or the equivalent to your language if it isn't American English.
@@ -235,7 +235,7 @@ Bash-it will automatically reload itself after activating or deactivating plugin
 
 ### Prompt Version Control Check
 
-Bash-it provides prompt themes the ability to check and display version control information for the current directory.
+Bash-it provides prompt themes with the ability to check and display version control information for the current directory.
 The information is retrieved for each directory and can slow down the navigation of projects with a large number of files and folders.
 Turn version control checking off to prevent slow directory navigation within large projects.
 
@@ -331,7 +331,7 @@ Set `SCM_GIT_SHOW_STASH_INFO` to 'false' to **don't show** it:
 
 ### Ahead/Behind Count
 
-When displaying information regarding whether or not the local branch is ahead or behind it's remote counterpart, you can opt to display the number of commits ahead/behind.
+When displaying information regarding whether or not the local branch is ahead or behind its remote counterpart, you can opt to display the number of commits ahead/behind.
 This is useful if you only care whether or not you are ahead or behind and do not care how far ahead/behind you are.
 
 Set `SCM_GIT_SHOW_COMMIT_COUNT` to 'true' (the default value) to **show** the count of commits ahead/behind:

From 8b7333cd299135ce175d293d495f12ccf0a0377f Mon Sep 17 00:00:00 2001
From: Mattia Rigotti <mrigotti@us.ibm.com>
Date: Fri, 27 Sep 2019 14:22:01 -0400
Subject: [PATCH 035/388] Add theme/sexy-python, a modified version of sexy
 which shows in which virtualenv or condaenv you are

---
 themes/sexy-python/sexy-python.theme.bash | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 themes/sexy-python/sexy-python.theme.bash

diff --git a/themes/sexy-python/sexy-python.theme.bash b/themes/sexy-python/sexy-python.theme.bash
new file mode 100644
index 00000000..e472218a
--- /dev/null
+++ b/themes/sexy-python/sexy-python.theme.bash
@@ -0,0 +1,46 @@
+# Small modification of Sexy Bash Prompt to include virtualenv and condaenv prompts
+# (Sexy Bash Prompt is inspired by "Extravagant Zsh Prompt"
+# with big thanks to \amethyst on Freenode)
+
+if tput setaf 1 &> /dev/null; then
+    if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
+      MAGENTA=$(tput setaf 9)
+      ORANGE=$(tput setaf 172)
+      GREEN=$(tput setaf 190)
+      PURPLE=$(tput setaf 141)
+      WHITE=$(tput setaf 0)
+    else
+      MAGENTA=$(tput setaf 5)
+      ORANGE=$(tput setaf 4)
+      GREEN=$(tput setaf 2)
+      PURPLE=$(tput setaf 1)
+      WHITE=$(tput setaf 7)
+    fi
+    BOLD=$(tput bold)
+    RESET=$(tput sgr0)
+else
+    MAGENTA="\033[1;31m"
+    ORANGE="\033[1;33m"
+    GREEN="\033[1;32m"
+    PURPLE="\033[1;35m"
+    WHITE="\033[1;37m"
+    BOLD=""
+    RESET="\033[m"
+fi
+
+parse_git_dirty () {
+  [[ $(git status 2> /dev/null | tail -n1 | cut -c 1-17) != "nothing to commit" ]] && echo "*"
+}
+parse_git_branch () {
+  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/"
+}
+
+env_prompt () {
+    echo -e "($(virtualenv_prompt)$(condaenv_prompt))"
+}
+
+function prompt_command() {
+    PS1="\[${BOLD}${WHITE}\]$(env_prompt) \[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
+}
+
+safe_append_prompt_command prompt_command

From b0a22e0b97b0234655a78cbc44d8bbedc0f6397d Mon Sep 17 00:00:00 2001
From: Mattia Rigotti <mrigotti@us.ibm.com>
Date: Fri, 4 Oct 2019 12:50:06 -0400
Subject: [PATCH 036/388] In themes/sexy add option to visualize python
 environment

---
 themes/sexy/sexy.theme.bash | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/themes/sexy/sexy.theme.bash b/themes/sexy/sexy.theme.bash
index 08869a3b..4250c540 100644
--- a/themes/sexy/sexy.theme.bash
+++ b/themes/sexy/sexy.theme.bash
@@ -1,6 +1,10 @@
 # Sexy Bash Prompt, inspired by "Extravagant Zsh Prompt"
 # Screenshot: http://cloud.gf3.ca/M5rG
 # A big thanks to \amethyst on Freenode
+#
+# Configuration:
+#   * To visualize python environment (virtualenv and conda) add in your .bash_profile the following line:
+#       export SEXY_WITH_PYTHON=true
 
 if tput setaf 1 &> /dev/null; then
     if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
@@ -34,9 +38,16 @@ parse_git_dirty () {
 parse_git_branch () {
   git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/"
 }
+env_prompt () {
+  echo -e "($(virtualenv_prompt)$(condaenv_prompt))"
+}
 
 function prompt_command() {
   PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
+
+  if [ "$SEXY_WITH_PYTHON" = true ] ; then
+    PS1="\[${BOLD}${WHITE}\]$(env_prompt) "$PS1
+  fi
 }
 
 safe_append_prompt_command prompt_command

From ed47edcb06079642ee1e28ea0ea46d7b9005c4e4 Mon Sep 17 00:00:00 2001
From: Mattia Rigotti <mrigotti@us.ibm.com>
Date: Fri, 4 Oct 2019 12:51:23 -0400
Subject: [PATCH 037/388] Remove themes/sexy-python (it is now integrated in
 themes/sexy)

---
 themes/sexy-python/sexy-python.theme.bash | 46 -----------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 themes/sexy-python/sexy-python.theme.bash

diff --git a/themes/sexy-python/sexy-python.theme.bash b/themes/sexy-python/sexy-python.theme.bash
deleted file mode 100644
index e472218a..00000000
--- a/themes/sexy-python/sexy-python.theme.bash
+++ /dev/null
@@ -1,46 +0,0 @@
-# Small modification of Sexy Bash Prompt to include virtualenv and condaenv prompts
-# (Sexy Bash Prompt is inspired by "Extravagant Zsh Prompt"
-# with big thanks to \amethyst on Freenode)
-
-if tput setaf 1 &> /dev/null; then
-    if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
-      MAGENTA=$(tput setaf 9)
-      ORANGE=$(tput setaf 172)
-      GREEN=$(tput setaf 190)
-      PURPLE=$(tput setaf 141)
-      WHITE=$(tput setaf 0)
-    else
-      MAGENTA=$(tput setaf 5)
-      ORANGE=$(tput setaf 4)
-      GREEN=$(tput setaf 2)
-      PURPLE=$(tput setaf 1)
-      WHITE=$(tput setaf 7)
-    fi
-    BOLD=$(tput bold)
-    RESET=$(tput sgr0)
-else
-    MAGENTA="\033[1;31m"
-    ORANGE="\033[1;33m"
-    GREEN="\033[1;32m"
-    PURPLE="\033[1;35m"
-    WHITE="\033[1;37m"
-    BOLD=""
-    RESET="\033[m"
-fi
-
-parse_git_dirty () {
-  [[ $(git status 2> /dev/null | tail -n1 | cut -c 1-17) != "nothing to commit" ]] && echo "*"
-}
-parse_git_branch () {
-  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/"
-}
-
-env_prompt () {
-    echo -e "($(virtualenv_prompt)$(condaenv_prompt))"
-}
-
-function prompt_command() {
-    PS1="\[${BOLD}${WHITE}\]$(env_prompt) \[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
-}
-
-safe_append_prompt_command prompt_command

From c0ac3d8393bfe6328f3e10b09734dc2f2a94465c Mon Sep 17 00:00:00 2001
From: markusdd <Krause.Markus@gmx.com>
Date: Sat, 5 Oct 2019 15:50:59 +0200
Subject: [PATCH 038/388] Update less-pretty-cat plugin to support pygment
 style selection

Pygments offers great styles and in dark terminals the default is unsatisfactory.

Use two new env variables BASH_IT_CLESS_STYLE and BASH_IT_CCAT_STYLE to select pygment themes.
Availables styles can be listes using pygmentize -L styles
---
 plugins/available/less-pretty-cat.plugin.bash | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/available/less-pretty-cat.plugin.bash b/plugins/available/less-pretty-cat.plugin.bash
index 841122ca..ce846868 100644
--- a/plugins/available/less-pretty-cat.plugin.bash
+++ b/plugins/available/less-pretty-cat.plugin.bash
@@ -13,9 +13,12 @@ if $(command -v pygmentize &> /dev/null) ; then
       about 'runs either pygmentize or cat on each file passed in'
       param '*: files to concatenate (as normally passed to cat)'
       example 'cat mysite/manage.py dir/text-file.txt'
+      if [ -z "$BASH_IT_CCAT_STYLE" ]; then
+          BASH_IT_CCAT_STYLE=default;
+      fi
       for var;
       do
-          pygmentize "$var" 2>/dev/null || "$CAT_BIN" "$var";
+          pygmentize -f 256 -O style="$BASH_IT_CCAT_STYLE" -g "$var" 2>/dev/null || "$CAT_BIN" "$var";
       done
   }
 
@@ -24,6 +27,9 @@ if $(command -v pygmentize &> /dev/null) ; then
       about 'it pigments the file passed in and passes it to less for pagination'
       param '$1: the file to paginate with less'
       example 'less mysite/manage.py'
-      pygmentize -g $* | "$LESS_BIN" -R
+      if [ -z "$BASH_IT_CLESS_STYLE" ]; then
+          BASH_IT_CLESS_STYLE=default;
+      fi
+      pygmentize -f 256 -O style="$BASH_IT_CLESS_STYLE" -g $* | "$LESS_BIN" -R
   }
 fi

From c9054e25a9c847eee4a8af27e47af2deec75bf28 Mon Sep 17 00:00:00 2001
From: markusdd <Krause.Markus@gmx.com>
Date: Mon, 7 Oct 2019 14:19:38 +0200
Subject: [PATCH 039/388] implement feedback

---
 plugins/available/less-pretty-cat.plugin.bash | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/available/less-pretty-cat.plugin.bash b/plugins/available/less-pretty-cat.plugin.bash
index ce846868..b6b9d1f0 100644
--- a/plugins/available/less-pretty-cat.plugin.bash
+++ b/plugins/available/less-pretty-cat.plugin.bash
@@ -5,6 +5,8 @@ if $(command -v pygmentize &> /dev/null) ; then
   # get the full paths to binaries
   CAT_BIN=$(which cat)
   LESS_BIN=$(which less)
+  BASH_IT_CCAT_STYLE="${BASH_IT_CCAT_STYLE:=default}"
+  BASH_IT_CLESS_STYLE="${BASH_IT_CLESS_STYLE:=default}"
 
   # pigmentize cat and less outputs - call them ccat and cless to avoid that
   # especially cat'ed output in scripts gets mangled with pygemtized meta characters
@@ -13,9 +15,6 @@ if $(command -v pygmentize &> /dev/null) ; then
       about 'runs either pygmentize or cat on each file passed in'
       param '*: files to concatenate (as normally passed to cat)'
       example 'cat mysite/manage.py dir/text-file.txt'
-      if [ -z "$BASH_IT_CCAT_STYLE" ]; then
-          BASH_IT_CCAT_STYLE=default;
-      fi
       for var;
       do
           pygmentize -f 256 -O style="$BASH_IT_CCAT_STYLE" -g "$var" 2>/dev/null || "$CAT_BIN" "$var";
@@ -27,9 +26,6 @@ if $(command -v pygmentize &> /dev/null) ; then
       about 'it pigments the file passed in and passes it to less for pagination'
       param '$1: the file to paginate with less'
       example 'less mysite/manage.py'
-      if [ -z "$BASH_IT_CLESS_STYLE" ]; then
-          BASH_IT_CLESS_STYLE=default;
-      fi
       pygmentize -f 256 -O style="$BASH_IT_CLESS_STYLE" -g $* | "$LESS_BIN" -R
   }
 fi

From ea02e3d6bd3ad603224cacb5ee7b56583dd6b693 Mon Sep 17 00:00:00 2001
From: Zanark <kiodeba11@gmail.com>
Date: Thu, 10 Oct 2019 16:54:43 +0530
Subject: [PATCH 040/388] added theme bash files

---
 themes/gitline/powerline.base.bash | 234 +++++++++++++++++++++++++++++
 themes/gitline/redline.theme.bash  |  68 +++++++++
 2 files changed, 302 insertions(+)
 create mode 100644 themes/gitline/powerline.base.bash
 create mode 100644 themes/gitline/redline.theme.bash

diff --git a/themes/gitline/powerline.base.bash b/themes/gitline/powerline.base.bash
new file mode 100644
index 00000000..925791fc
--- /dev/null
+++ b/themes/gitline/powerline.base.bash
@@ -0,0 +1,234 @@
+# Define this here so it can be used by all of the Powerline themes
+THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true}
+
+#To set color for foreground and background
+function set_color {
+  set +u
+  if [[ "${1}" != "-" ]]; then
+    fg="38;5;${1}"
+  fi
+  if [[ "${2}" != "-" ]]; then
+    bg="48;5;${2}"
+    [[ -n "${fg}" ]] && bg=";${bg}"
+  fi
+  echo -e "\[\033[${fg}${bg}m\]"
+}
+
+#Customising User Info Segment
+function __powerline_user_info_prompt {
+  local user_info="${USER}"
+  local color=${USER_INFO_THEME_PROMPT_COLOR}
+  local fg_color=15
+
+  if [[ "${THEME_CHECK_SUDO}" = true ]]; then
+    if sudo -n uptime 2>&1 | grep -q "load"; then
+      color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
+    fi
+  fi
+
+  case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
+    "sudo")
+      if [[ "${color}" = "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
+        user_info="👑 ${USER}"
+        fg_color=227
+        color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
+      fi
+      ;;
+    *)
+      if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
+        user_info="${USER_INFO_SSH_CHAR}${USER}"
+      else
+        user_info="${USER}"
+      fi
+      ;;
+  esac
+  [[ -n "${user_info}" ]] && echo "${user_info}|${color}|${fg_color}"
+}
+
+#Customising Ruby Prompt
+function __powerline_ruby_prompt {
+  local ruby_version=""
+  local fg_color=206
+
+  if _command_exists rvm; then
+    ruby_version="$(rvm_version_prompt)"
+  elif _command_exists rbenv; then
+    ruby_version=$(rbenv_version_prompt)
+  fi
+
+  [[ -n "${ruby_version}" ]] && echo "${RUBY_CHAR}${ruby_version}|${RUBY_THEME_PROMPT_COLOR}|${fg_color}"
+}
+
+#Customising Python (venv) Prompt
+function __powerline_python_venv_prompt {
+  set +u
+  local python_venv=""
+  local fg_color=206
+
+  if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+    python_venv="${CONDA_DEFAULT_ENV}"
+    PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
+  elif [[ -n "${VIRTUAL_ENV}" ]]; then
+    python_venv=$(basename "${VIRTUAL_ENV}")
+  fi
+
+  [[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}|${fg_color}"
+}
+
+#Customising SCM Prompt
+function __powerline_scm_prompt {
+  local color=""
+  local scm_prompt=""
+  local fg_color=206
+
+  scm_prompt_vars
+
+  # echo "${scm}"
+
+  if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
+    if [[ "${SCM_DIRTY}" -eq 3 ]]; then
+      color=${SCM_THEME_PROMPT_STAGED_COLOR}
+      fg_color=124
+    elif [[ "${SCM_DIRTY}" -eq 2 ]]; then
+      color=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
+      fg_color=56
+    elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
+      color=${SCM_THEME_PROMPT_DIRTY_COLOR}
+      fg_color=118
+    elif [[ "${SCM_DIRTY}" -eq 0 ]]; then
+      color=${SCM_THEME_PROMPT_CLEAN_COLOR}
+      fg_color=16
+    else
+      color=${SCM_THEME_PROMPT_COLOR}
+      fg_color=255
+    fi
+    # if [[ "${SCM_BRANCH}" == "master" ]]; then
+    #   color=128
+    #   fg_color=251
+    # fi
+    if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
+      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+    elif [[ "${SCM_P4_CHAR}" == "${SCM_CHAR}" ]]; then
+      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+    elif [[ "${SCM_HG_CHAR}" == "${SCM_CHAR}" ]]; then
+      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+    fi
+    echo "${scm_prompt}${scm}|${color}|${fg_color}"
+  fi
+}
+
+function __powerline_cwd_prompt {
+  local cwd=$(pwd | sed "s|^${HOME}|~|")
+  local fg_color=16
+
+  echo "${cwd}|${CWD_THEME_PROMPT_COLOR}|${fg_color}"
+}
+
+function __powerline_hostname_prompt {
+    local fg_color=206
+
+    echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}|${fg_color}"
+}
+
+function __powerline_wd_prompt {
+    local fg_color=206
+
+  echo "\W|${CWD_THEME_PROMPT_COLOR}|${fg_color}"
+}
+
+function __powerline_clock_prompt {
+    local fg_color=206
+
+  echo "$(date +"${THEME_CLOCK_FORMAT}")|${CLOCK_THEME_PROMPT_COLOR}|${fg_color}"
+}
+
+function __powerline_battery_prompt {
+  local color=""
+  local battery_status="$(battery_percentage 2> /dev/null)"
+  local fg_color=255
+
+  if [[ -z "${battery_status}" ]] || [[ "${battery_status}" = "-1" ]] || [[ "${battery_status}" = "no" ]]; then
+    true
+  else
+    if [[ "$((10#${battery_status}))" -le 5 ]]; then
+      color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
+    elif [[ "$((10#${battery_status}))" -le 25 ]]; then
+      color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
+    else
+      color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
+    fi
+    ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
+    echo "${battery_status}%|${color}|${fg_color}"
+  fi
+}
+
+function __powerline_in_vim_prompt {
+    local fg_color=206
+
+  if [ -n "$VIMRUNTIME" ]; then
+    echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}|${fg_color}"
+  fi
+}
+
+function __powerline_aws_profile_prompt {
+    local fg_color=206
+
+  if [[ -n "${AWS_PROFILE}" ]]; then
+    echo "${AWS_PROFILE_CHAR}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR}|${fg_color}"
+  fi
+}
+
+function __powerline_left_segment {
+  local OLD_IFS="${IFS}"; IFS="|"
+  local params=( $1 )
+  IFS="${OLD_IFS}"
+  local separator_char="${POWERLINE_LEFT_SEPARATOR}"
+  local separator=""
+  local fg_color=206
+
+  #for seperator character
+  if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
+    separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
+  fi
+  #change here to cahnge fg color
+  #echo "${params[0]} -> ${params[1]} -> ${params[2]}"
+  LEFT_PROMPT+="${separator}$(set_color ${params[2]} ${params[1]}) ${params[0]} ${normal}"
+  #seperator char color = current bg
+  LAST_SEGMENT_COLOR=${params[1]}
+  (( SEGMENTS_AT_LEFT += 1 ))
+}
+
+function __powerline_last_status_prompt {
+  [[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
+}
+
+function __powerline_prompt_command {
+  local last_status="$?" ## always the first
+  local separator_char="${POWERLINE_PROMPT_CHAR}"
+
+  LEFT_PROMPT=""
+  SEGMENTS_AT_LEFT=0
+  LAST_SEGMENT_COLOR=""
+
+
+  if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then
+      LEFT_PROMPT+="$(set_color ${PROMPT_DISTRO_LOGO_COLOR} ${PROMPT_DISTRO_LOGO_COLORBG})${PROMPT_DISTRO_LOGO}$(set_color - -)"
+  fi
+
+  ## left prompt ##
+  for segment in $POWERLINE_PROMPT; do
+    local info="$(__powerline_${segment}_prompt)"
+    [[ -n "${info}" ]] && __powerline_left_segment "${info}"
+  done
+
+  [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
+  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"
+
+  PS1="${LEFT_PROMPT} "
+
+  ## cleanup ##
+  unset LAST_SEGMENT_COLOR \
+        LEFT_PROMPT \
+        SEGMENTS_AT_LEFT
+}
+
diff --git a/themes/gitline/redline.theme.bash b/themes/gitline/redline.theme.bash
new file mode 100644
index 00000000..425c5897
--- /dev/null
+++ b/themes/gitline/redline.theme.bash
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+. "$BASH_IT/themes/redline/powerline.base.bash"
+
+#For the logo
+#PROMPT_DISTRO_LOGO="💻"
+PROMPT_DISTRO_LOGO_COLOR=15
+PROMPT_DISTRO_LOGO_COLORBG=52
+
+#Prompt Seperator Charactors
+PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
+POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
+
+#USER INFO CHARACTERS
+USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
+USER_INFO_SUDO_CHAR=${POWERLINE_USER_INFO_SUDO_CHAR:=" "}
+USER_INFO_THEME_PROMPT_COLOR=91
+USER_INFO_THEME_PROMPT_COLOR_SUDO=1
+
+PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:=" "}
+CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
+PYTHON_VENV_THEME_PROMPT_COLOR=17
+
+SCM_NONE_CHAR=""
+SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
+SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
+SCM_THEME_PROMPT_CLEAN=" ✓ "
+SCM_THEME_PROMPT_DIRTY=" ⨯ "
+SCM_THEME_PROMPT_COLOR=91
+SCM_THEME_PROMPT_CLEAN_COLOR=41
+SCM_THEME_PROMPT_DIRTY_COLOR=94
+SCM_THEME_PROMPT_STAGED_COLOR=220 #52
+SCM_THEME_PROMPT_UNSTAGED_COLOR=81
+#SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
+
+
+RVM_THEME_PROMPT_PREFIX=""
+RVM_THEME_PROMPT_SUFFIX=""
+RBENV_THEME_PROMPT_PREFIX=""
+RBENV_THEME_PROMPT_SUFFIX=""
+RUBY_THEME_PROMPT_COLOR=161
+RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
+
+CWD_THEME_DIR_SEPARATOR=""
+CWD_THEME_DIR_SEPARATOR_COLOR=52
+CWD_THEME_PROMPT_COLOR=252
+
+HOST_THEME_PROMPT_COLOR=88
+
+LAST_STATUS_THEME_PROMPT_COLOR=52
+
+CLOCK_THEME_PROMPT_COLOR=240
+
+BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
+BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
+BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
+BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
+
+THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
+
+IN_VIM_THEME_PROMPT_COLOR=245
+IN_VIM_THEME_PROMPT_TEXT="vim"
+
+#POWERLINE_PROMPT=${POWERLINE_PROMPT:="python_venv ruby user_info hostname cwd scm"}
+#POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
+
+
+safe_append_prompt_command __powerline_prompt_command

From fd1a477716f4ff6dc5a90be84f523c481286cef5 Mon Sep 17 00:00:00 2001
From: NEwa-05 <mageekbox@gmail.com>
Date: Fri, 11 Oct 2019 12:36:49 +0000
Subject: [PATCH 041/388] change git alias following issues #1419

---
 aliases/available/git.aliases.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index fc95300d..7e3d53ee 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -27,7 +27,7 @@ alias gpr='git pull --rebase'
 alias gpp='git pull && git push'
 alias gup='git fetch && git rebase'
 alias gp='git push'
-alias gpo='git push origin'
+alias gpo='git push origin HEAD'
 alias gpu='git push --set-upstream'
 alias gpuo='git push --set-upstream origin'
 alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'

From 9a543ead482b0157cd7b774dcb1d7594c58e623c Mon Sep 17 00:00:00 2001
From: Zanark <kiodeba11@gmail.com>
Date: Sat, 12 Oct 2019 13:15:24 +0530
Subject: [PATCH 042/388] renamed files

---
 themes/gitline/{redline.theme.bash => gitline.theme.bash} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename themes/gitline/{redline.theme.bash => gitline.theme.bash} (100%)

diff --git a/themes/gitline/redline.theme.bash b/themes/gitline/gitline.theme.bash
similarity index 100%
rename from themes/gitline/redline.theme.bash
rename to themes/gitline/gitline.theme.bash

From 08785d96b574fa93f43a55c968edac697bbe33f3 Mon Sep 17 00:00:00 2001
From: Mattia Rigotti <mrigotti@us.ibm.com>
Date: Sat, 12 Oct 2019 11:48:51 +0200
Subject: [PATCH 043/388] Delete stand-alone theme sexy-python

---
 themes/sexy-python/sexy-python.theme.bash | 46 -----------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 themes/sexy-python/sexy-python.theme.bash

diff --git a/themes/sexy-python/sexy-python.theme.bash b/themes/sexy-python/sexy-python.theme.bash
deleted file mode 100644
index e472218a..00000000
--- a/themes/sexy-python/sexy-python.theme.bash
+++ /dev/null
@@ -1,46 +0,0 @@
-# Small modification of Sexy Bash Prompt to include virtualenv and condaenv prompts
-# (Sexy Bash Prompt is inspired by "Extravagant Zsh Prompt"
-# with big thanks to \amethyst on Freenode)
-
-if tput setaf 1 &> /dev/null; then
-    if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
-      MAGENTA=$(tput setaf 9)
-      ORANGE=$(tput setaf 172)
-      GREEN=$(tput setaf 190)
-      PURPLE=$(tput setaf 141)
-      WHITE=$(tput setaf 0)
-    else
-      MAGENTA=$(tput setaf 5)
-      ORANGE=$(tput setaf 4)
-      GREEN=$(tput setaf 2)
-      PURPLE=$(tput setaf 1)
-      WHITE=$(tput setaf 7)
-    fi
-    BOLD=$(tput bold)
-    RESET=$(tput sgr0)
-else
-    MAGENTA="\033[1;31m"
-    ORANGE="\033[1;33m"
-    GREEN="\033[1;32m"
-    PURPLE="\033[1;35m"
-    WHITE="\033[1;37m"
-    BOLD=""
-    RESET="\033[m"
-fi
-
-parse_git_dirty () {
-  [[ $(git status 2> /dev/null | tail -n1 | cut -c 1-17) != "nothing to commit" ]] && echo "*"
-}
-parse_git_branch () {
-  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1$(parse_git_dirty)/"
-}
-
-env_prompt () {
-    echo -e "($(virtualenv_prompt)$(condaenv_prompt))"
-}
-
-function prompt_command() {
-    PS1="\[${BOLD}${WHITE}\]$(env_prompt) \[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
-}
-
-safe_append_prompt_command prompt_command

From a50a4ff633bed3ac27bd761f3e86889750696549 Mon Sep 17 00:00:00 2001
From: Mattia Rigotti <mrigotti@us.ibm.com>
Date: Sat, 12 Oct 2019 11:50:54 +0200
Subject: [PATCH 044/388] Rename variable to SEXY_THEME_SHOW_PYTHON

---
 themes/sexy/sexy.theme.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/sexy/sexy.theme.bash b/themes/sexy/sexy.theme.bash
index 4250c540..fdbbf83d 100644
--- a/themes/sexy/sexy.theme.bash
+++ b/themes/sexy/sexy.theme.bash
@@ -4,7 +4,7 @@
 #
 # Configuration:
 #   * To visualize python environment (virtualenv and conda) add in your .bash_profile the following line:
-#       export SEXY_WITH_PYTHON=true
+#       export SEXY_THEME_SHOW_PYTHON=true
 
 if tput setaf 1 &> /dev/null; then
     if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
@@ -45,7 +45,7 @@ env_prompt () {
 function prompt_command() {
   PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$([[ -n \$(git branch 2> /dev/null) ]] && echo \" on \")\[$PURPLE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]"
 
-  if [ "$SEXY_WITH_PYTHON" = true ] ; then
+  if [ "$SEXY_THEME_SHOW_PYTHON" = true ] ; then
     PS1="\[${BOLD}${WHITE}\]$(env_prompt) "$PS1
   fi
 }

From 05ded884658defde0fbc160a9d718f35f33bf845 Mon Sep 17 00:00:00 2001
From: Mattia Rigotti <mrigotti@us.ibm.com>
Date: Sat, 12 Oct 2019 11:52:53 +0200
Subject: [PATCH 045/388] Set SEXY_THEME_SHOW_PYTHON variable default value

---
 themes/sexy/sexy.theme.bash | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/themes/sexy/sexy.theme.bash b/themes/sexy/sexy.theme.bash
index fdbbf83d..41d195d2 100644
--- a/themes/sexy/sexy.theme.bash
+++ b/themes/sexy/sexy.theme.bash
@@ -6,6 +6,9 @@
 #   * To visualize python environment (virtualenv and conda) add in your .bash_profile the following line:
 #       export SEXY_THEME_SHOW_PYTHON=true
 
+# Default setting
+SEXY_THEME_SHOW_PYTHON="${SEXY_THEME_SHOW_PYTHON:=false}"
+
 if tput setaf 1 &> /dev/null; then
     if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
       MAGENTA=$(tput setaf 9)

From 0e8b6775b9f3f0de09fea8049deb4318566a008e Mon Sep 17 00:00:00 2001
From: zwfang <zwfangio@gmail.com>
Date: Fri, 11 Oct 2019 23:09:50 +0800
Subject: [PATCH 046/388] Add a new theme named newin :)

---
 themes/newin/newin.theme.bash | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 themes/newin/newin.theme.bash

diff --git a/themes/newin/newin.theme.bash b/themes/newin/newin.theme.bash
new file mode 100644
index 00000000..9f54dc8a
--- /dev/null
+++ b/themes/newin/newin.theme.bash
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+SCM_THEME_PROMPT_DIRTY=" ${red}✗"
+SCM_THEME_PROMPT_CLEAN=" ${green}✓"
+SCM_THEME_PROMPT_PREFIX=" ${purple}|${green} "
+SCM_THEME_PROMPT_SUFFIX="${purple} |"
+
+prompt() {
+    exit_code=$?
+    PS1="$(if [[ ${exit_code} = 0 ]]; then echo "${green}${exit_code}"; else echo "${red}${exit_code}"; fi) ${yellow}\t ${cyan}\w$(scm_prompt_info)${reset_color}\n${orange}$ ${reset_color}"
+}
+
+safe_append_prompt_command prompt

From f99ccbd1f20e2671821669458b5b704fecb3ed00 Mon Sep 17 00:00:00 2001
From: Zanark <kiodeba11@gmail.com>
Date: Fri, 18 Oct 2019 11:13:19 +0530
Subject: [PATCH 047/388] Removed redundant code and added some descriptive
 comments

---
 themes/gitline/gitline.theme.bash  | 12 ++++++------
 themes/gitline/powerline.base.bash | 10 ++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash
index 425c5897..3e6be360 100644
--- a/themes/gitline/gitline.theme.bash
+++ b/themes/gitline/gitline.theme.bash
@@ -2,7 +2,7 @@
 
 . "$BASH_IT/themes/redline/powerline.base.bash"
 
-#For the logo
+#For the logo(Uncomment if you want a logo before your name)
 #PROMPT_DISTRO_LOGO="💻"
 PROMPT_DISTRO_LOGO_COLOR=15
 PROMPT_DISTRO_LOGO_COLORBG=52
@@ -17,10 +17,12 @@ USER_INFO_SUDO_CHAR=${POWERLINE_USER_INFO_SUDO_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=91
 USER_INFO_THEME_PROMPT_COLOR_SUDO=1
 
+#PYTHON VENV
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:=" "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
 PYTHON_VENV_THEME_PROMPT_COLOR=17
 
+#GIT Prompt Symbols
 SCM_NONE_CHAR=""
 SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
 SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
@@ -31,9 +33,8 @@ SCM_THEME_PROMPT_CLEAN_COLOR=41
 SCM_THEME_PROMPT_DIRTY_COLOR=94
 SCM_THEME_PROMPT_STAGED_COLOR=220 #52
 SCM_THEME_PROMPT_UNSTAGED_COLOR=81
-#SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
-
 
+#Ruby Prompt Symbols
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
@@ -49,8 +50,10 @@ HOST_THEME_PROMPT_COLOR=88
 
 LAST_STATUS_THEME_PROMPT_COLOR=52
 
+#Clock
 CLOCK_THEME_PROMPT_COLOR=240
 
+#For Battery Plugin
 BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
 BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
@@ -61,8 +64,5 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
-#POWERLINE_PROMPT=${POWERLINE_PROMPT:="python_venv ruby user_info hostname cwd scm"}
-#POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
-
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/gitline/powerline.base.bash b/themes/gitline/powerline.base.bash
index 925791fc..45387b02 100644
--- a/themes/gitline/powerline.base.bash
+++ b/themes/gitline/powerline.base.bash
@@ -1,4 +1,4 @@
-# Define this here so it can be used by all of the Powerline themes
+# Sudo check after every command
 THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true}
 
 #To set color for foreground and background
@@ -75,7 +75,7 @@ function __powerline_python_venv_prompt {
   [[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}|${fg_color}"
 }
 
-#Customising SCM Prompt
+#Customising SCM(GIT) Prompt
 function __powerline_scm_prompt {
   local color=""
   local scm_prompt=""
@@ -83,7 +83,6 @@ function __powerline_scm_prompt {
 
   scm_prompt_vars
 
-  # echo "${scm}"
 
   if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
     if [[ "${SCM_DIRTY}" -eq 3 ]]; then
@@ -102,10 +101,6 @@ function __powerline_scm_prompt {
       color=${SCM_THEME_PROMPT_COLOR}
       fg_color=255
     fi
-    # if [[ "${SCM_BRANCH}" == "master" ]]; then
-    #   color=128
-    #   fg_color=251
-    # fi
     if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
       scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
     elif [[ "${SCM_P4_CHAR}" == "${SCM_CHAR}" ]]; then
@@ -191,7 +186,6 @@ function __powerline_left_segment {
     separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
   fi
   #change here to cahnge fg color
-  #echo "${params[0]} -> ${params[1]} -> ${params[2]}"
   LEFT_PROMPT+="${separator}$(set_color ${params[2]} ${params[1]}) ${params[0]} ${normal}"
   #seperator char color = current bg
   LAST_SEGMENT_COLOR=${params[1]}

From cf86219418f3e62a916a15667dbdb677068188e5 Mon Sep 17 00:00:00 2001
From: wukuan405 <wukuan405@gmail.com>
Date: Mon, 28 Oct 2019 12:26:06 +0900
Subject: [PATCH 048/388] updated hub completion

---
 completion/available/hub.completion.bash | 36 ++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/completion/available/hub.completion.bash b/completion/available/hub.completion.bash
index bd84d322..8653084c 100644
--- a/completion/available/hub.completion.bash
+++ b/completion/available/hub.completion.bash
@@ -6,8 +6,8 @@ if ! declare -F _git > /dev/null && declare -F _completion_loader > /dev/null; t
   _completion_loader git
 fi
 
-# Check that git tab completion is available
-if declare -F _git > /dev/null; then
+# Check that git tab completion is available and we haven't already set up completion
+if declare -F _git > /dev/null && ! declare -F __git_list_all_commands_without_hub > /dev/null; then
   # Duplicate and rename the 'list_all_commands' function
   eval "$(declare -f __git_list_all_commands | \
         sed 's/__git_list_all_commands/__git_list_all_commands_without_hub/')"
@@ -17,11 +17,16 @@ if declare -F _git > /dev/null; then
     cat <<-EOF
 alias
 pull-request
+pr
+issue
+release
 fork
 create
+delete
 browse
 compare
 ci-status
+sync
 EOF
     __git_list_all_commands_without_hub
   }
@@ -213,21 +218,36 @@ EOF
     esac
   }
 
-  # hub fork [--no-remote]
+  # hub fork [--no-remote] [--remote-name REMOTE] [--org ORGANIZATION]
   _git_fork() {
-    local i c=2 remote=yes
+    local i c=2 flags="--no-remote --remote-name --org"
     while [ $c -lt $cword ]; do
       i="${words[c]}"
       case "$i" in
+        --org)
+          ((c++))
+          flags=${flags/$i/}
+          ;;
+        --remote-name)
+          ((c++))
+          flags=${flags/$i/}
+          flags=${flags/--no-remote/}
+          ;;
         --no-remote)
-          unset remote
+          flags=${flags/$i/}
+          flags=${flags/--remote-name/}
           ;;
       esac
       ((c++))
     done
-    if [ -n "$remote" ]; then
-      __gitcomp "--no-remote"
-    fi
+    case "$prev" in
+      --remote-name|--org)
+        COMPREPLY=()
+        ;;
+      *)
+        __gitcomp "$flags"
+        ;;
+    esac
   }
 
   # hub pull-request [-f] [-m <MESSAGE>|-F <FILE>|-i <ISSUE>|<ISSUE-URL>] [-b <BASE>] [-h <HEAD>] [-a <USER>] [-M <MILESTONE>] [-l <LABELS>]

From 35066f91b2c7472d06b822bb1de32752316c504c Mon Sep 17 00:00:00 2001
From: zwfang <zwfangio@gmail.com>
Date: Thu, 31 Oct 2019 21:56:54 +0800
Subject: [PATCH 049/388] add alias gcamd for `git commit --amend`

---
 aliases/available/git.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 7e3d53ee..9a65b22a 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -43,6 +43,7 @@ alias gca='git commit -v -a'
 alias gcm='git commit -v -m'
 alias gcam="git commit -v -am"
 alias gci='git commit --interactive'
+alias gcamd='git commit --amend'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbt='git branch --track'

From 349c1df5564642b71bc92bf295e07963b166dcb2 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Fri, 1 Nov 2019 10:38:34 -0700
Subject: [PATCH 050/388] Adds soft-separator suport to powerline themes

---
 themes/powerline-multiline/powerline-multiline.base.bash  | 8 +++++++-
 themes/powerline-multiline/powerline-multiline.theme.bash | 2 ++
 themes/powerline/powerline.base.bash                      | 7 ++++++-
 themes/powerline/powerline.theme.bash                     | 1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index ac442f73..ea8b2624 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -9,6 +9,7 @@ function __powerline_right_segment {
   local params=( $1 )
   IFS="${OLD_IFS}"
   local separator_char="${POWERLINE_RIGHT_SEPARATOR}"
+  local separator_char_soft="${POWERLINE_RIGHT_SEPARATOR_SOFT}"
   local padding="${POWERLINE_PADDING}"
   local separator_color=""
 
@@ -16,7 +17,12 @@ function __powerline_right_segment {
     separator_char="${POWERLINE_RIGHT_END}"
     separator_color="$(set_color ${params[1]} -)"
   else
-    separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})"
+      if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
+        separator_color="$(set_color - ${LAST_SEGMENT_COLOR})"
+        separator_char=${separator_char_soft}
+      else
+        separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})"
+      fi
     (( padding += 1 ))
   fi
   RIGHT_PROMPT+="${separator_color}${separator_char}${normal}$(set_color - ${params[1]}) ${params[0]} ${normal}$(set_color - ${COLOR})${normal}"
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index ad64fb18..5c8187eb 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -5,7 +5,9 @@
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"}
 POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
+POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
 POWERLINE_RIGHT_SEPARATOR=${POWERLINE_RIGHT_SEPARATOR:=""}
+POWERLINE_RIGHT_SEPARATOR_SOFT=${POWERLINE_RIGHT_SEPARATOR_SOFT:=""}
 POWERLINE_LEFT_END=${POWERLINE_LEFT_END:=""}
 POWERLINE_RIGHT_END=${POWERLINE_RIGHT_END:=""}
 POWERLINE_PADDING=${POWERLINE_PADDING:=2}
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 9e668a6c..d55fd60f 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -159,10 +159,15 @@ function __powerline_left_segment {
   local params=( $1 )
   IFS="${OLD_IFS}"
   local separator_char="${POWERLINE_LEFT_SEPARATOR}"
+  local separator_char_soft="${POWERLINE_LEFT_SEPARATOR_SOFT}"
   local separator=""
 
   if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
-    separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
+    if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
+      separator="$(set_color - ${LAST_SEGMENT_COLOR})${separator_char_soft}${normal}"
+    else
+      separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
+    fi
   fi
   LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 377e6f8e..bdf741cf 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -4,6 +4,7 @@
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
 POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
+POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=32

From 83abf624dd762e2b86e4d26109a881fba8d3ecb8 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Fri, 1 Nov 2019 17:51:22 -0700
Subject: [PATCH 051/388] Updates README files for soft separators

---
 themes/powerline-multiline/README.md | 4 ++++
 themes/powerline/README.md           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index ee6095dd..a2e6d121 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -42,6 +42,10 @@ export THEME_CLOCK_FORMAT="%H:%M:%S"
 
 The time/date is printed by the `date` command, so refer to its man page to change the format.
 
+### Soft Separators
+
+Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
+
 ### Segment Order
 
 The contents of both prompt sides can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 974bcbeb..de399761 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -41,6 +41,10 @@ You can change the format using the following variable:
 
 The time/date is printed by the `date` command, so refer to its man page to change the format.
 
+### Soft Separators
+
+Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
+
 ### Segment Order
 
 The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:

From 55ce8951410cb37c5ae02836daf03c7f5e69ffd1 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Fri, 1 Nov 2019 23:16:39 -0700
Subject: [PATCH 052/388] Adds SHORT_USER/HOSTNAME support to powerline themes

---
 themes/powerline/powerline.base.bash | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 9e668a6c..e8b5ef37 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -30,10 +30,11 @@ function __powerline_user_info_prompt {
       fi
       ;;
     *)
+      local user=${SHORT_USER:-${USER}}
       if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
-        user_info="${USER_INFO_SSH_CHAR}${USER}"
+        user_info="${USER_INFO_SSH_CHAR}${user}"
       else
-        user_info="${USER}"
+        user_info="${user}"
       fi
       ;;
   esac
@@ -112,7 +113,7 @@ function __powerline_cwd_prompt {
 }
 
 function __powerline_hostname_prompt {
-    echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}"
+    echo "${SHORT_HOSTNAME:-$(hostname -s)}|${HOST_THEME_PROMPT_COLOR}"
 }
 
 function __powerline_wd_prompt {

From f0c1caa090ecd3614c5c83a7554fe8c6144ab294 Mon Sep 17 00:00:00 2001
From: Zanark <kiodeba11@gmail.com>
Date: Mon, 4 Nov 2019 15:19:52 +0530
Subject: [PATCH 053/388] resolved powerline.base path issue

---
 themes/gitline/gitline.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash
index 3e6be360..5debacb6 100644
--- a/themes/gitline/gitline.theme.bash
+++ b/themes/gitline/gitline.theme.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. "$BASH_IT/themes/redline/powerline.base.bash"
+. "$BASH_IT/themes/powerline/powerline.base.bash"
 
 #For the logo(Uncomment if you want a logo before your name)
 #PROMPT_DISTRO_LOGO="💻"

From fcc3631a9a55cea9901d74b3725e26a39a2da532 Mon Sep 17 00:00:00 2001
From: Zanark <kiodeba11@gmail.com>
Date: Mon, 4 Nov 2019 15:22:18 +0530
Subject: [PATCH 054/388] resolved powerline.base path issue

---
 themes/gitline/gitline.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash
index 5debacb6..995b8c07 100644
--- a/themes/gitline/gitline.theme.bash
+++ b/themes/gitline/gitline.theme.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. "$BASH_IT/themes/powerline/powerline.base.bash"
+. "$BASH_IT/themes/gitline/powerline.base.bash"
 
 #For the logo(Uncomment if you want a logo before your name)
 #PROMPT_DISTRO_LOGO="💻"

From 5a2dbd4780ddc22ece39bed05e90b9fb9c76dccd Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 6 Nov 2019 15:05:32 -0800
Subject: [PATCH 055/388] Fixes prompt bg color on powerline naked theme

---
 themes/powerline-naked/powerline-naked.base.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash
index f6b11f42..b97c93cf 100644
--- a/themes/powerline-naked/powerline-naked.base.bash
+++ b/themes/powerline-naked/powerline-naked.base.bash
@@ -11,5 +11,6 @@ function __powerline_left_segment {
     separator="${separator_char}"
   fi
   LEFT_PROMPT+="${separator}$(set_color ${params[1]} -) ${params[0]} ${normal}"
+  LAST_SEGMENT_COLOR=${params[1]}
   (( SEGMENTS_AT_LEFT += 1 ))
 }

From 377f02714def7c259cdc8a24d4c08622b1c929dd Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@users.noreply.github.com>
Date: Wed, 20 Nov 2019 01:49:34 -0600
Subject: [PATCH 056/388] Simplify multiple path support in go plugin (#1284)

* simplify wrapped pathmunge logic. update tests to account for cases with spaces in $PATH.
---
 plugins/available/go.plugin.bash | 24 ++++--------
 test/plugins/go.plugin.bats      | 65 ++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/plugins/available/go.plugin.bash b/plugins/available/go.plugin.bash
index 910194e5..566d7669 100755
--- a/plugins/available/go.plugin.bash
+++ b/plugins/available/go.plugin.bash
@@ -3,27 +3,17 @@
 cite about-plugin
 about-plugin 'go environment variables & path configuration'
 
-[ ! command -v go &>/dev/null ] && return
+command -v go &>/dev/null || return
 
-function _split_path_reverse() {
-  local a=( ${@//:/ } )
+function _go_pathmunge_wrap() {
+  IFS=':' local -a 'a=($1)'
   local i=${#a[@]}
-  local r=
   while [ $i -gt 0 ] ; do
     i=$(( i - 1 ))
-    if [ $(( i + 1 )) -eq ${#a[@]} ] ; then
-      r="${a[i]}"
-    else
-      r="${r} ${a[i]}"
-    fi
+    pathmunge "${a[i]}/bin"
   done
-  echo "$r"
 }
 
-export GOROOT=${GOROOT:-$(go env GOROOT)}
-pathmunge "${GOROOT}/bin"
-
-export GOPATH=${GOPATH:-$(go env GOPATH)}
-for p in $( _split_path_reverse ${GOPATH} ) ; do
-  pathmunge "${p}/bin"
-done
+export GOROOT="${GOROOT:-$(go env GOROOT)}"
+export GOPATH="${GOPATH:-$(go env GOPATH)}"
+_go_pathmunge_wrap "${GOPATH}:${GOROOT}"
diff --git a/test/plugins/go.plugin.bats b/test/plugins/go.plugin.bats
index e2b27e02..02806205 100644
--- a/test/plugins/go.plugin.bats
+++ b/test/plugins/go.plugin.bats
@@ -1,44 +1,53 @@
 #!/usr/bin/env bats
 
-#load ../test_helper
+load ../test_helper
 load ../../lib/helpers
 load ../../lib/composure
-load ../../plugins/available/go.plugin
 
-@test 'plugins go: reverse path: single entry' {
-  run _split_path_reverse '/foo'
-  echo "output = ${output}"
-  [ "$output" = "/foo" ]
-}
-
-@test 'plugins go: reverse path: single entry, colon empty' {
-  run _split_path_reverse '/foo:'
-  echo "output = ${output}"
-  [ "$output" = "/foo" ]
-}
-
-@test 'plugins go: reverse path: single entry, colon whitespace' {
-  run _split_path_reverse '/foo: '
-  echo "output = ${output}"
-  [ "$output" = "/foo" ]
-}
-
-@test 'plugins go: reverse path: multiple entries' {
-  run _split_path_reverse '/foo:/bar'
-  echo "output = ${output}"
-  [ "$output" = "/bar /foo" ]
+@test 'ensure _go_pathmunge_wrap is defined' {
+  load ../../plugins/available/go.plugin
+  run type -t _go_pathmunge_wrap
+  assert_line 'function'
 }
 
 @test 'plugins go: single entry in GOPATH' {
   export GOPATH="/foo"
+  export GOROOT="/baz"
   load ../../plugins/available/go.plugin
-  echo "$(echo $PATH | cut -d':' -f1,2)"
-  [ "$(echo $PATH | cut -d':' -f1)" = "/foo/bin" ]
+  assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "/foo/bin:/baz/bin"
+}
+
+@test 'plugins go: single entry in GOPATH, with space' {
+  export GOPATH="/foo bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "/foo bar/bin:/baz/bin"
+}
+
+@test 'plugins go: single entry in GOPATH, with escaped space' {
+  export GOPATH="/foo\ bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "/foo\ bar/bin:/baz/bin"
 }
 
 @test 'plugins go: multiple entries in GOPATH' {
   export GOPATH="/foo:/bar"
+  export GOROOT="/baz"
   load ../../plugins/available/go.plugin
-  echo "$(echo $PATH | cut -d':' -f1,2)"
-  [ "$(echo $PATH | cut -d':' -f1,2)" = "/foo/bin:/bar/bin" ]
+  assert_equal "$(cut -d':' -f1,2,3 <<<$PATH)" "/foo/bin:/bar/bin:/baz/bin"
+}
+
+@test 'plugins go: multiple entries in GOPATH, with space' {
+  export GOPATH="/foo:/foo bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2,3 <<<$PATH)" "/foo/bin:/foo bar/bin:/baz/bin"
+}
+
+@test 'plugins go: multiple entries in GOPATH, with escaped space' {
+  export GOPATH="/foo:/foo\ bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2,3 <<<$PATH)" "/foo/bin:/foo\ bar/bin:/baz/bin"
 }

From 29bb382cc13c66378692b2fef30560457a4b7cf6 Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Wed, 27 Nov 2019 18:01:28 +0530
Subject: [PATCH 057/388] added man colors plugin

---
 plugins/available/man.plugin.bash | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 plugins/available/man.plugin.bash

diff --git a/plugins/available/man.plugin.bash b/plugins/available/man.plugin.bash
new file mode 100644
index 00000000..438779f0
--- /dev/null
+++ b/plugins/available/man.plugin.bash
@@ -0,0 +1,10 @@
+cite about-plugin
+about-plugin 'colorize man pages for better readability'
+
+export LESS_TERMCAP_mb=$'\e[1;32m'
+export LESS_TERMCAP_md=$'\e[1;32m'
+export LESS_TERMCAP_me=$'\e[0m'
+export LESS_TERMCAP_se=$'\e[0m'
+export LESS_TERMCAP_so=$'\e[01;33m'
+export LESS_TERMCAP_ue=$'\e[0m'
+export LESS_TERMCAP_us=$'\e[1;4;31m'
\ No newline at end of file

From 00030bfed58660fd1161793274eca9b18e49e1b3 Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Wed, 27 Nov 2019 19:04:23 +0530
Subject: [PATCH 058/388] added laravel completions

---
 completion/available/laravel.completion.bash | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 completion/available/laravel.completion.bash

diff --git a/completion/available/laravel.completion.bash b/completion/available/laravel.completion.bash
new file mode 100644
index 00000000..bf24f67e
--- /dev/null
+++ b/completion/available/laravel.completion.bash
@@ -0,0 +1,16 @@
+#!/usr/bin/bash
+
+if command -v laravel > /dev/null; then
+    __laravel_completion()  {
+        local OPTS=("-h --help -q --quiet --ansi --no-ansi -n --no-interaction -v -vv -vvv --verbose help list new")
+        COMPREPLY=()
+        for _opt_ in ${OPTS[@]}; do
+            if [[ "$_opt_" == "$2"* ]]; then
+                COMPREPLY+=("$_opt_")
+            fi
+        done
+    }
+    
+    complete -F __laravel_completion laravel
+fi
+

From a6e912854af3e10054173973837acccddde76504 Mon Sep 17 00:00:00 2001
From: Eduardo Bellido Bellido <edubxb@gmail.com>
Date: Mon, 2 Dec 2019 08:36:57 +0100
Subject: [PATCH 059/388] Show NodeJS version in Powerline themes (#1438)

Currently, only nvm is supported.
---
 themes/base.theme.bash                           | 16 ++++++++++++++++
 themes/powerline-multiline/README.md             |  1 +
 .../powerline-multiline.theme.bash               |  7 ++++++-
 themes/powerline-naked/README.md                 |  1 +
 .../powerline-naked/powerline-naked.theme.bash   |  7 ++++++-
 themes/powerline-plain/README.md                 |  1 +
 .../powerline-plain/powerline-plain.theme.bash   |  9 +++++++--
 themes/powerline/README.md                       |  1 +
 themes/powerline/powerline.base.bash             |  7 +++++++
 themes/powerline/powerline.theme.bash            |  7 ++++++-
 10 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 8d90f043..d193191e 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -62,6 +62,9 @@ SCM_SVN_CHAR='⑆'
 SCM_NONE='NONE'
 SCM_NONE_CHAR='○'
 
+NVM_THEME_PROMPT_PREFIX=' |'
+NVM_THEME_PROMPT_SUFFIX='|'
+
 RVM_THEME_PROMPT_PREFIX=' |'
 RVM_THEME_PROMPT_SUFFIX='|'
 
@@ -306,6 +309,19 @@ function hg_prompt_vars {
     fi
 }
 
+function nvm_version_prompt {
+  local node
+  if declare -f -F nvm &> /dev/null; then
+    node=$(nvm current 2> /dev/null)
+    [[ "${node}" == "system" ]] && return
+    echo -e "${NVM_THEME_PROMPT_PREFIX}${node}${NVM_THEME_PROMPT_SUFFIX}"
+  fi
+}
+
+function node_version_prompt {
+  echo -e "$(nvm_version_prompt)"
+}
+
 function rvm_version_prompt {
   if which rvm &> /dev/null; then
     rvm=$(rvm-prompt) || return
diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index ee6095dd..965c593a 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -56,6 +56,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `python_venv` - Python virtual environment information (`virtualenv`, `venv`
   and `conda` supported)
 * `ruby` - Current ruby version if using `rvm`
+* `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git` 
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index ad64fb18..dcd1a51b 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -29,6 +29,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
 SCM_THEME_PROMPT_UNSTAGED_COLOR=92
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
+NVM_THEME_PROMPT_PREFIX=""
+NVM_THEME_PROMPT_SUFFIX=""
+NODE_THEME_PROMPT_COLOR=22
+NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
+
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
@@ -57,7 +62,7 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
 
 HOST_THEME_PROMPT_COLOR=0
 
-POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby cwd"}
+POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
 POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index da5e254b..1f16c296 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -54,6 +54,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `python_venv` - Python virtual environment information (`virtualenv`, `venv`
   and `conda` supported)
 * `ruby` - Current ruby version if using `rvm`
+* `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git`
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 81025c84..6b8859bd 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -26,6 +26,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
 SCM_THEME_PROMPT_UNSTAGED_COLOR=92
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
+NVM_THEME_PROMPT_PREFIX=""
+NVM_THEME_PROMPT_SUFFIX=""
+NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
+NODE_THEME_PROMPT_COLOR=22
+
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
@@ -57,6 +62,6 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
 
 HOST_THEME_PROMPT_COLOR=254
 
-POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
+POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 701b9fa1..6ea21a18 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -52,6 +52,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `python_venv` - Python virtual environment information (`virtualenv`, `venv`
   and `conda` supported)
 * `ruby` - Current ruby version if using `rvm`
+* `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git`
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index f9538c2a..c3ce1817 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -21,6 +21,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
 SCM_THEME_PROMPT_UNSTAGED_COLOR=92
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
+NVM_THEME_PROMPT_PREFIX=""
+NVM_THEME_PROMPT_SUFFIX=""
+NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
+NODE_THEME_PROMPT_COLOR=22
+
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
@@ -52,6 +57,6 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
 
 HOST_THEME_PROMPT_COLOR=0
 
-POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
+POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
-safe_append_prompt_command __powerline_prompt_command
\ No newline at end of file
+safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 974bcbeb..acb51d9f 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -56,6 +56,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `python_venv` - Python virtual environment information (`virtualenv`, `venv`
   and `conda` supported)
 * `ruby` - Current ruby version if using `rvm`
+* `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git`
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 9e668a6c..5fe6614d 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -40,6 +40,13 @@ function __powerline_user_info_prompt {
   [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
 }
 
+function __powerline_node_prompt {
+  local node_version=""
+
+  node_version="$(node_version_prompt)"
+  [[ -n "${node_version}" ]] && echo "${NODE_CHAR}${node_version}|${NODE_THEME_PROMPT_COLOR}"
+}
+
 function __powerline_ruby_prompt {
   local ruby_version=""
 
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 377e6f8e..bff8a6ca 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -24,6 +24,11 @@ SCM_THEME_PROMPT_STAGED_COLOR=30
 SCM_THEME_PROMPT_UNSTAGED_COLOR=92
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
+NVM_THEME_PROMPT_PREFIX=""
+NVM_THEME_PROMPT_SUFFIX=""
+NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
+NODE_THEME_PROMPT_COLOR=22
+
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
@@ -55,7 +60,7 @@ IN_VIM_THEME_PROMPT_TEXT="vim"
 
 HOST_THEME_PROMPT_COLOR=0
 
-POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
+POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 HISTORY_AUTOSAVE=${HISTORY_AUTOSAVE:-0}
 

From 7460ee0496919926bd80d681dc143435ec71202d Mon Sep 17 00:00:00 2001
From: Youssef El Saadany <youssef.el-saadany@unchartech.com>
Date: Fri, 6 Dec 2019 15:06:13 +0100
Subject: [PATCH 060/388] New Vi-mode theme

---
 themes/ramses/ramses.theme.bash | 109 ++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 themes/ramses/ramses.theme.bash

diff --git a/themes/ramses/ramses.theme.bash b/themes/ramses/ramses.theme.bash
new file mode 100644
index 00000000..37fd00f1
--- /dev/null
+++ b/themes/ramses/ramses.theme.bash
@@ -0,0 +1,109 @@
+SCM_THEME_PROMPT_PREFIX=""
+SCM_THEME_PROMPT_SUFFIX=""
+
+SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
+SCM_GIT_CHAR="${bold_green}±${normal}"
+SCM_SVN_CHAR="${bold_cyan}⑆${normal}"
+SCM_HG_CHAR="${bold_red}☿${normal}"
+
+#Mysql Prompt
+export MYSQL_PS1="(\u@\h) [\d]> "
+
+case $TERM in
+        xterm*)
+        TITLEBAR="\[\033]0;\w\007\]"
+        ;;
+        *)
+        TITLEBAR=""
+        ;;
+esac
+
+PS3=">> "
+
+__my_rvm_ruby_version() {
+    local gemset=$(echo $GEM_HOME | awk -F'@' '{print $2}')
+  [ "$gemset" != "" ] && gemset="@$gemset"
+    local version=$(echo $MY_RUBY_HOME | awk -F'-' '{print $2}')
+    local full="$version$gemset"
+  [ "$full" != "" ] && echo "[$full]"
+}
+
+is_vim_shell() {
+        if [ ! -z "$VIMRUNTIME" ]
+        then
+                echo "[${cyan}vim shell${normal}]"
+        fi
+}
+
+modern_scm_prompt() {
+        CHAR=$(scm_char)
+        if [ $CHAR = $SCM_NONE_CHAR ]
+        then
+                return
+        else
+                echo "[$(scm_char)][$(scm_prompt_info)]"
+        fi
+}
+
+# show chroot if exist
+chroot(){
+    if [ -n "$debian_chroot" ]
+    then 
+        my_ps_chroot="${bold_cyan}$debian_chroot${normal}";
+        echo "($my_ps_chroot)";
+    fi
+    }
+
+# show virtualenvwrapper
+my_ve(){
+
+    if [ -n "$CONDA_DEFAULT_ENV" ]
+    then
+        my_ps_ve="${bold_purple}${CONDA_DEFAULT_ENV}${normal}";
+        echo "($my_ps_ve)";
+    elif [ -n "$VIRTUAL_ENV" ]
+    then 
+        my_ps_ve="${bold_purple}$ve${normal}";
+        echo "($my_ps_ve)";
+    fi
+    echo "";
+    }
+
+prompt() {
+
+    my_ps_host="${green}\h${normal}";
+    # yes, these are the the same for now ...
+    my_ps_host_root="${green}\h${normal}";
+ 
+    my_ps_user="${bold_green}\u${normal}"
+    my_ps_root="${bold_red}\u${normal}";
+
+    if [ -n "$VIRTUAL_ENV" ]
+    then
+        ve=`basename $VIRTUAL_ENV`;
+    fi
+
+    # nice prompt
+    case "`id -u`" in
+        0) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_root][$my_ps_host_root]$(modern_scm_prompt)$(__my_rvm_ruby_version)[${cyan}\w${normal}]
+▪ "
+        ;;
+        *) PS1="${TITLEBAR}┌─$(my_ve)$(chroot)[$my_ps_user][$my_ps_host]$(modern_scm_prompt)$(__my_rvm_ruby_version)
+|─[${bold_purple}\w${normal}]
+▪ "
+        ;;
+    esac
+}
+
+PS2="▪ "
+
+# vi mode
+set -o vi
+bind 'set vi-ins-mode-string "└+"'
+bind 'set vi-cmd-mode-string "└─"'
+bind 'set show-mode-in-prompt on'
+bind '"jj":vi-movement-mode'
+VIMRUNTIME='true'
+
+safe_append_prompt_command prompt

From db2c6683f13a02716cd0f068e6726f414ce58ca4 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Sun, 3 Nov 2019 22:56:40 -0800
Subject: [PATCH 061/388] Makes all powerline vars configurable

Makes all powerline vars configurable

Makes all powerline vars configurable

Makes all powerline vars configurable
---
 .../powerline-multiline.theme.bash            | 42 +++++++++---------
 .../powerline-naked.theme.bash                | 44 +++++++++----------
 .../powerline-plain.theme.bash                | 40 ++++++++---------
 themes/powerline/powerline.theme.bash         | 42 +++++++++---------
 4 files changed, 83 insertions(+), 85 deletions(-)

diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index dcd1a51b..d80628bb 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-
 . "$BASH_IT/themes/powerline-multiline/powerline-multiline.base.bash"
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"}
@@ -11,22 +10,22 @@ POWERLINE_RIGHT_END=${POWERLINE_RIGHT_END:=""}
 POWERLINE_PADDING=${POWERLINE_PADDING:=2}
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
-USER_INFO_THEME_PROMPT_COLOR=32
-USER_INFO_THEME_PROMPT_COLOR_SUDO=202
+USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
+USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
 
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
-PYTHON_VENV_THEME_PROMPT_COLOR=35
+PYTHON_VENV_THEME_PROMPT_COLOR=${POWERLINE_PYTHON_VENV_COLOR:=35}
 
 SCM_NONE_CHAR=""
 SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
 SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
 SCM_THEME_PROMPT_CLEAN=""
 SCM_THEME_PROMPT_DIRTY=""
-SCM_THEME_PROMPT_CLEAN_COLOR=25
-SCM_THEME_PROMPT_DIRTY_COLOR=88
-SCM_THEME_PROMPT_STAGED_COLOR=30
-SCM_THEME_PROMPT_UNSTAGED_COLOR=92
+SCM_THEME_PROMPT_CLEAN_COLOR=${POWERLINE_SCM_CLEAN_COLOR:=25}
+SCM_THEME_PROMPT_DIRTY_COLOR=${POWERLINE_SCM_DIRTY_COLOR:=88}
+SCM_THEME_PROMPT_STAGED_COLOR=${POWERLINE_SCM_STAGED_COLOR:=30}
+SCM_THEME_PROMPT_UNSTAGED_COLOR=${POWERLINE_SCM_UNSTAGED_COLOR:=92}
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
@@ -38,29 +37,32 @@ RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
 RBENV_THEME_PROMPT_SUFFIX=""
-RUBY_THEME_PROMPT_COLOR=161
+RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
 
-AWS_PROFILE_CHAR="${POWERLINE_AWS_PROFILE_CHAR:=❲aws❳ }"
-AWS_PROFILE_PROMPT_COLOR=208
+KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
+KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
-CWD_THEME_PROMPT_COLOR=240
+AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
+AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
-LAST_STATUS_THEME_PROMPT_COLOR=196
+CWD_THEME_PROMPT_COLOR=${POWERLINE_CWD_COLOR:=240}
 
-CLOCK_THEME_PROMPT_COLOR=240
+LAST_STATUS_THEME_PROMPT_COLOR=${POWERLINE_LAST_STATUS_COLOR:=196}
+
+CLOCK_THEME_PROMPT_COLOR=${POWERLINE_CLOCK_COLOR:=240}
 
 BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
-BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
-BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
-BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
+BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=${POWERLINE_BATTERY_GOOD_COLOR:=70}
+BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=${POWERLINE_BATTERY_LOW_COLOR:=208}
+BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=${POWERLINE_BATTERY_CRITICAL_COLOR:=160}
 
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 
-IN_VIM_THEME_PROMPT_COLOR=245
-IN_VIM_THEME_PROMPT_TEXT="vim"
+IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
+IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
-HOST_THEME_PROMPT_COLOR=0
+HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
 POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
 POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 6b8859bd..c20f8c43 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -1,29 +1,27 @@
 #!/usr/bin/env bash
 
-POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
-
 . "$BASH_IT/themes/powerline-naked/powerline-naked.base.bash"
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
+POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
-USER_INFO_THEME_PROMPT_COLOR=240
-USER_INFO_THEME_PROMPT_COLOR_SUDO=202
+USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=240}
+USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
 
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
-PYTHON_VENV_THEME_PROMPT_COLOR=35
+PYTHON_VENV_THEME_PROMPT_COLOR=${POWERLINE_PYTHON_VENV_COLOR:=35}
 
 SCM_NONE_CHAR=""
 SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
 SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
 SCM_THEME_PROMPT_CLEAN=""
 SCM_THEME_PROMPT_DIRTY=""
-SCM_THEME_PROMPT_COLOR=238
-SCM_THEME_PROMPT_CLEAN_COLOR=25
-SCM_THEME_PROMPT_DIRTY_COLOR=88
-SCM_THEME_PROMPT_STAGED_COLOR=30
-SCM_THEME_PROMPT_UNSTAGED_COLOR=92
+SCM_THEME_PROMPT_CLEAN_COLOR=${POWERLINE_SCM_CLEAN_COLOR:=25}
+SCM_THEME_PROMPT_DIRTY_COLOR=${POWERLINE_SCM_DIRTY_COLOR:=88}
+SCM_THEME_PROMPT_STAGED_COLOR=${POWERLINE_SCM_STAGED_COLOR:=30}
+SCM_THEME_PROMPT_UNSTAGED_COLOR=${POWERLINE_SCM_UNSTAGED_COLOR:=92}
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
@@ -35,32 +33,32 @@ RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
 RBENV_THEME_PROMPT_SUFFIX=""
-RUBY_THEME_PROMPT_COLOR=161
+RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
 
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
-KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=26
+KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
-AWS_PROFILE_CHAR="${POWERLINE_AWS_PROFILE_CHAR:=❲aws❳ }"
-AWS_PROFILE_PROMPT_COLOR=208
+AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
+AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
-CWD_THEME_PROMPT_COLOR=254
+CWD_THEME_PROMPT_COLOR=${POWERLINE_CWD_COLOR:=254}
 
-LAST_STATUS_THEME_PROMPT_COLOR=124
+LAST_STATUS_THEME_PROMPT_COLOR=${POWERLINE_LAST_STATUS_COLOR:=124}
 
-CLOCK_THEME_PROMPT_COLOR=240
+CLOCK_THEME_PROMPT_COLOR=${POWERLINE_CLOCK_COLOR:=240}
 
 BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
-BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
-BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
-BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
+BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=${POWERLINE_BATTERY_GOOD_COLOR:=70}
+BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=${POWERLINE_BATTERY_LOW_COLOR:=208}
+BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=${POWERLINE_BATTERY_CRITICAL_COLOR:=160}
 
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 
-IN_VIM_THEME_PROMPT_COLOR=245
-IN_VIM_THEME_PROMPT_TEXT="vim"
+IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
+IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
-HOST_THEME_PROMPT_COLOR=254
+HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=254}
 
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index c3ce1817..cf1a163f 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -3,22 +3,22 @@
 . "$BASH_IT/themes/powerline-plain/powerline-plain.base.bash"
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "}
-USER_INFO_THEME_PROMPT_COLOR=32
-USER_INFO_THEME_PROMPT_COLOR_SUDO=202
+USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
+USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
 
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="ⓔ "}
-PYTHON_VENV_THEME_PROMPT_COLOR=35
+PYTHON_VENV_THEME_PROMPT_COLOR=${POWERLINE_PYTHON_VENV_COLOR:=35}
 
 SCM_NONE_CHAR=""
 SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:="⎇  "}
 SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
 SCM_THEME_PROMPT_CLEAN=""
 SCM_THEME_PROMPT_DIRTY=""
-SCM_THEME_PROMPT_CLEAN_COLOR=25
-SCM_THEME_PROMPT_DIRTY_COLOR=88
-SCM_THEME_PROMPT_STAGED_COLOR=30
-SCM_THEME_PROMPT_UNSTAGED_COLOR=92
+SCM_THEME_PROMPT_CLEAN_COLOR=${POWERLINE_SCM_CLEAN_COLOR:=25}
+SCM_THEME_PROMPT_DIRTY_COLOR=${POWERLINE_SCM_DIRTY_COLOR:=88}
+SCM_THEME_PROMPT_STAGED_COLOR=${POWERLINE_SCM_STAGED_COLOR:=30}
+SCM_THEME_PROMPT_UNSTAGED_COLOR=${POWERLINE_SCM_UNSTAGED_COLOR:=92}
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
@@ -30,32 +30,32 @@ RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
 RBENV_THEME_PROMPT_SUFFIX=""
-RUBY_THEME_PROMPT_COLOR=161
+RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="💎 "}
 
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
-KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=26
+KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
-AWS_PROFILE_CHAR="${POWERLINE_AWS_PROFILE_CHAR:=❲aws❳ }"
-AWS_PROFILE_PROMPT_COLOR=208
+AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
+AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
-CWD_THEME_PROMPT_COLOR=240
+CWD_THEME_PROMPT_COLOR=${POWERLINE_CWD_COLOR:=240}
 
-LAST_STATUS_THEME_PROMPT_COLOR=52
+LAST_STATUS_THEME_PROMPT_COLOR=${POWERLINE_LAST_STATUS_COLOR:=52}
 
-CLOCK_THEME_PROMPT_COLOR=240
+CLOCK_THEME_PROMPT_COLOR=${POWERLINE_CLOCK_COLOR:=240}
 
 BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="+ "}
-BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
-BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
-BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
+BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=${POWERLINE_BATTERY_GOOD_COLOR:=70}
+BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=${POWERLINE_BATTERY_LOW_COLOR:=208}
+BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=${POWERLINE_BATTERY_CRITICAL_COLOR:=160}
 
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 
-IN_VIM_THEME_PROMPT_COLOR=245
-IN_VIM_THEME_PROMPT_TEXT="vim"
+IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
+IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
-HOST_THEME_PROMPT_COLOR=0
+HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index bff8a6ca..ace88ebe 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -6,22 +6,22 @@ PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
 POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
-USER_INFO_THEME_PROMPT_COLOR=32
-USER_INFO_THEME_PROMPT_COLOR_SUDO=202
+USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
+USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
 
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
-PYTHON_VENV_THEME_PROMPT_COLOR=35
+PYTHON_VENV_THEME_PROMPT_COLOR=${POWERLINE_PYTHON_VENV_COLOR:=35}
 
 SCM_NONE_CHAR=""
 SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
 SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
 SCM_THEME_PROMPT_CLEAN=""
 SCM_THEME_PROMPT_DIRTY=""
-SCM_THEME_PROMPT_CLEAN_COLOR=25
-SCM_THEME_PROMPT_DIRTY_COLOR=88
-SCM_THEME_PROMPT_STAGED_COLOR=30
-SCM_THEME_PROMPT_UNSTAGED_COLOR=92
+SCM_THEME_PROMPT_CLEAN_COLOR=${POWERLINE_SCM_CLEAN_COLOR:=25}
+SCM_THEME_PROMPT_DIRTY_COLOR=${POWERLINE_SCM_DIRTY_COLOR:=88}
+SCM_THEME_PROMPT_STAGED_COLOR=${POWERLINE_SCM_STAGED_COLOR:=30}
+SCM_THEME_PROMPT_UNSTAGED_COLOR=${POWERLINE_SCM_UNSTAGED_COLOR:=92}
 SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
@@ -33,35 +33,33 @@ RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 RBENV_THEME_PROMPT_PREFIX=""
 RBENV_THEME_PROMPT_SUFFIX=""
-RUBY_THEME_PROMPT_COLOR=161
+RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
 
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
-KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=26
+KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
-AWS_PROFILE_CHAR="${POWERLINE_AWS_PROFILE_CHAR:=❲aws❳ }"
-AWS_PROFILE_PROMPT_COLOR=208
+AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
+AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
-CWD_THEME_PROMPT_COLOR=240
+CWD_THEME_PROMPT_COLOR=${POWERLINE_CWD_COLOR:=240}
 
-LAST_STATUS_THEME_PROMPT_COLOR=52
+LAST_STATUS_THEME_PROMPT_COLOR=${POWERLINE_LAST_STATUS_COLOR:=52}
 
-CLOCK_THEME_PROMPT_COLOR=240
+CLOCK_THEME_PROMPT_COLOR=${POWERLINE_CLOCK_COLOR:=240}
 
 BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
-BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
-BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
-BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
+BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=${POWERLINE_BATTERY_GOOD_COLOR:=70}
+BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=${POWERLINE_BATTERY_LOW_COLOR:=208}
+BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=${POWERLINE_BATTERY_CRITICAL_COLOR:=160}
 
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 
-IN_VIM_THEME_PROMPT_COLOR=245
-IN_VIM_THEME_PROMPT_TEXT="vim"
+IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
+IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
-HOST_THEME_PROMPT_COLOR=0
+HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
-HISTORY_AUTOSAVE=${HISTORY_AUTOSAVE:-0}
-
 safe_append_prompt_command __powerline_prompt_command

From 921cfea68d2deb4db039119e2684dbc46a9ae67c Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 18 Dec 2019 19:32:49 -0800
Subject: [PATCH 062/388] Makes NODE vars configurable

---
 themes/powerline-multiline/powerline-multiline.theme.bash | 2 +-
 themes/powerline-naked/powerline-naked.theme.bash         | 2 +-
 themes/powerline-plain/powerline-plain.theme.bash         | 2 +-
 themes/powerline/powerline.theme.bash                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index d80628bb..e90b494e 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -30,8 +30,8 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
-NODE_THEME_PROMPT_COLOR=22
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
+NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
 
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index c20f8c43..2a5b7b26 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -27,7 +27,7 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
-NODE_THEME_PROMPT_COLOR=22
+NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
 
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index cf1a163f..4d539470 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -24,7 +24,7 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
-NODE_THEME_PROMPT_COLOR=22
+NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
 
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index ace88ebe..26182a82 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -27,7 +27,7 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
-NODE_THEME_PROMPT_COLOR=22
+NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
 
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""

From 7c73b22e75ac7cceffaec9bc88b6c20d5b5436b6 Mon Sep 17 00:00:00 2001
From: Hongyi Zhao <hongyi.zhao@gmail.com>
Date: Thu, 19 Dec 2019 16:45:39 +0800
Subject: [PATCH 063/388] fix completion/available/brew.completion.bash for the
 git-clone based installation

---
 completion/available/brew.completion.bash | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/completion/available/brew.completion.bash b/completion/available/brew.completion.bash
index 5cbd1595..572c9389 100644
--- a/completion/available/brew.completion.bash
+++ b/completion/available/brew.completion.bash
@@ -8,4 +8,11 @@ if which brew >/dev/null 2>&1; then
   if [ -f "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]; then
     . "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
   fi
+
+  # For the git-clone based installation, see here for more info:
+  # https://github.com/Bash-it/bash-it/issues/1458
+  # https://docs.brew.sh/Shell-Completion   
+  if [ -f "$BREW_PREFIX"/completions/bash/brew ]; then
+    . "$BREW_PREFIX"/completions/bash/brew
+  fi
 fi

From 6f2376daa23930387e95891777776344f5ba481c Mon Sep 17 00:00:00 2001
From: Hongyi Zhao <hongyi.zhao@gmail.com>
Date: Thu, 19 Dec 2019 16:53:24 +0800
Subject: [PATCH 064/388] touch up completion/available/brew.completion.bash

---
 completion/available/brew.completion.bash | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/completion/available/brew.completion.bash b/completion/available/brew.completion.bash
index 572c9389..9d010f05 100644
--- a/completion/available/brew.completion.bash
+++ b/completion/available/brew.completion.bash
@@ -1,18 +1,13 @@
 if which brew >/dev/null 2>&1; then
   BREW_PREFIX=$(brew --prefix)
-
   if [ -f "$BREW_PREFIX"/etc/bash_completion.d/brew ]; then
     . "$BREW_PREFIX"/etc/bash_completion.d/brew
-  fi
-
-  if [ -f "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]; then
+  elif [ -f "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]; then
     . "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
-  fi
-
-  # For the git-clone based installation, see here for more info:
-  # https://github.com/Bash-it/bash-it/issues/1458
-  # https://docs.brew.sh/Shell-Completion   
-  if [ -f "$BREW_PREFIX"/completions/bash/brew ]; then
+  elif [ -f "$BREW_PREFIX"/completions/bash/brew ]; then
+    # For the git-clone based installation, see here for more info:
+    # https://github.com/Bash-it/bash-it/issues/1458
+    # https://docs.brew.sh/Shell-Completion   
     . "$BREW_PREFIX"/completions/bash/brew
   fi
 fi

From ac7d8779114a335d5041a85cbf46f3e81e1d68ae Mon Sep 17 00:00:00 2001
From: Radoslaw Smigielski <radoslaw.smigielski@nokia.com>
Date: Thu, 19 Dec 2019 21:05:59 +0000
Subject: [PATCH 065/388] New theme for Python developers

Colorful theme for Python developers with no external
requirements.
---
 themes/radek/README.md        | 19 +++++++++++++++++++
 themes/radek/radek.theme.bash | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 themes/radek/README.md
 create mode 100644 themes/radek/radek.theme.bash

diff --git a/themes/radek/README.md b/themes/radek/README.md
new file mode 100644
index 00000000..2dfff808
--- /dev/null
+++ b/themes/radek/README.md
@@ -0,0 +1,19 @@
+# Powerline Theme
+
+A colorful theme for Python developers.
+It does not have any requirments.
+
+## Provided Information
+
+* Current username and hostname
+* Current path
+* Git repository status
+* Current Python environment (venv, Conda )
+* Current Python version
+
+## Examples
+
+```bash
+[radek@photon][~/src/nokia2/cbis] ±[master → origin ↑1 {1}✓][venv-cbis][py-3.7.5]
+→
+```
diff --git a/themes/radek/radek.theme.bash b/themes/radek/radek.theme.bash
new file mode 100644
index 00000000..bc47b011
--- /dev/null
+++ b/themes/radek/radek.theme.bash
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+GIT_THEME_PROMPT_DIRTY="${red}✗"
+GIT_THEME_PROMPT_CLEAN="${bold_green}✓"
+GIT_THEME_PROMPT_PREFIX="${bold_cyan}["
+GIT_THEME_PROMPT_SUFFIX="${bold_cyan}]"
+
+VIRTUALENV_THEME_PROMPT_PREFIX="${bold_green}["
+VIRTUALENV_THEME_PROMPT_SUFFIX="${bold_green}]"
+CONDAENV_THEME_PROMPT_PREFIX="${bold_green}["
+CONDAENV_THEME_PROMPT_SUFFIX="${bold_green}]"
+PYTHON_THEME_PROMPT_PREFIX="${bold_green}["
+PYTHON_THEME_PROMPT_SUFFIX="${bold_green}]"
+
+function prompt_command() {
+  PS1="\n${bold_white}[\u@\h]${bold_yellow}[\w] ${bold_cyan}$(scm_prompt_char_info)$(python_version_prompt)${green}\n→${reset_color} "
+}
+
+safe_append_prompt_command prompt_command

From 4721cdfdac31e6e519d88a001e24171d135fa344 Mon Sep 17 00:00:00 2001
From: Muhammad Muhammad Ibrahim <mibradev@gmail.com>
Date: Fri, 27 Dec 2019 05:40:57 +0200
Subject: [PATCH 066/388] Update bundler completion from @mernen

---
 completion/available/bundler.completion.bash | 247 ++++++++++++++++---
 1 file changed, 218 insertions(+), 29 deletions(-)

diff --git a/completion/available/bundler.completion.bash b/completion/available/bundler.completion.bash
index cdb7cf54..4ad04bdc 100644
--- a/completion/available/bundler.completion.bash
+++ b/completion/available/bundler.completion.bash
@@ -1,7 +1,7 @@
 #! bash
 # bash completion for the `bundle` command.
 #
-# Copyright (c) 2011-2013 Daniel Luz <dev at mernen dot com>.
+# Copyright (c) 2011-2017 Daniel Luz <dev at mernen dot com>.
 # Distributed under the MIT license.
 # http://mernen.com/projects/completion-ruby
 #
@@ -9,28 +9,166 @@
 #   . completion-bundle
 
 __bundle() {
-  local cur=$2
-  local prev=$3
-  local bundle_command
-  __bundle_get_command
-  COMPREPLY=()
+    local bundle_bin=("${_RUBY_COMMAND_PREFIX[@]}" "$1")
+    local cur prev
+    _get_comp_words_by_ref -n : cur prev
+    local bundle_command
+    local bundle_command_index
+    __bundle_get_command
+    COMPREPLY=()
 
-  local options
-  if [[ $cur = -* ]]; then
-      options="--no-color --verbose"
-      if [[ -z $bundle_command ]]; then
-          options="$options --version --help"
-      fi
-  elif [[ $bundle_command = "exec" ]]; then
-      _bundle_exec_completions
-      return
-  else
-      if [[ -z $bundle_command || $bundle_command = help ]]; then
-          options="help install update package exec config check list show
-                   console open viz init gem"
-      fi
-  fi
-  COMPREPLY=($(compgen -W "$options" -- "$cur"))
+    local options
+    if [[ $cur = -* && $bundle_command != exec ]]; then
+        options="-V --help --no-color --no-no-color --verbose --no-verbose"
+        case $bundle_command in
+        "")
+            options="$options --version";;
+        check)
+            options="$options --dry-run --gemfile --path -r --retry";;
+        clean)
+            options="$options --dry-run --force";;
+        config)
+            options="$options --local --global --delete";;
+        doctor)
+            options="$options --gemfile --quiet --no-quiet";;
+        gem)
+            options="$options -b -e -t --bin --coc --no-coc --edit --exe
+                     --no-exe --ext --no-ext --mit --no-mit --test";;
+        init)
+            options="$options --gemspec";;
+        install)
+            options="$options --binstubs --clean --deployment --force --frozen
+                     --full-index --gemfile --jobs --local --no-cache
+                     --no-prune --path --quiet --retry --shebang --standalone
+                     --system --trust-policy --with --without";;
+        lock)
+            options="$options --add-platform --conservative --full-index
+                     --local --lockfile --major --minor --patch --print
+                     --remove-platform --strict --update";;
+        package)
+            options="$options --all --all-platforms";;
+        platform)
+            options="$options --ruby";;
+        show)
+            options="$options --outdated --paths --no-paths";;
+        update)
+            options="$options --bundler --conservative --force --full-index
+                     --group --jobs --local --major --minor --patch --quiet
+                     --ruby --source --strict";;
+        viz)
+            options="$options -f -F -R -v -W --file --format --requirements
+                     --no-requirements --version --no-version --without";;
+        esac
+    else
+        case $bundle_command in
+        "" | help)
+            options="help install update package exec config
+                     check show outdated console open lock viz init gem
+                     platform clean doctor"
+            ;;
+        check | install)
+            case $prev in
+            --binstubs | --path)
+                _filedir -d
+                return;;
+            --standalone | --with | --without)
+                __bundle_complete_groups
+                return;;
+            --trust-policy)
+                options="HighSecurity MediumSecurity LowSecurity
+                         AlmostNoSecurity NoSecurity";;
+            esac
+            ;;
+        config)
+            case $prev in
+            config | --*)
+                case $cur in
+                local.*)
+                    options=($(__bundle_exec_ruby 'puts Bundler.definition.specs.to_hash.keys'))
+                    options=("${options[*]/#/local.}")
+                    ;;
+                *)
+                    options=(path frozen without bin gemfile ssl_ca_cert
+                             ssl_client_cert cache_path disable_multisource
+                             ignore_messages retry redirect timeout
+                             force_ruby_platform specific_platform
+                             disable_checksum_validation disable_version_check
+                             allow_offline_install auto_install
+                             cache_all_platforms cache_all clean console
+                             disable_exec_load disable_local_branch_check
+                             disable_shared_gems jobs major_deprecations
+                             no_install no_prune only_update_to_newer_versions
+                             plugins shebang silence_root_warning
+                             ssl_verify_mode system_bindir user_agent)
+                    # We want to suggest the options above as complete words,
+                    # and also "local." and "mirror." as prefixes
+                    # To achieve that, disable automatic space insertion,
+                    # insert it manually, then add the non-spaced prefixes
+                    compopt -o nospace
+                    options=("${options[@]/%/ }")
+                    # And add prefix suggestions
+                    options+=(local. mirror.)
+                    # Override $IFS for completion to work
+                    local IFS=$'\n'
+                    COMPREPLY=($(compgen -W '${options[@]}' -- "$cur"))
+                    return
+                    ;;
+                esac
+                ;;
+            path | local.*)
+                _filedir -d
+                return;;
+            esac
+            ;;
+        exec)
+            if [[ $COMP_CWORD -eq $bundle_command_index ]]; then
+                # Figure out Bundler's binaries dir
+                local bundler_bin=$(__bundle_exec_ruby 'puts Bundler.bundle_path + "bin"')
+                if [[ -d $bundler_bin ]]; then
+                    local binaries=("$bundler_bin"/*)
+                    # If there are binaries, strip directory name and use them
+                    [[ -f "$binaries" ]] && options="${binaries[@]##*/}"
+                else
+                    # No binaries found; use full command completion
+                    COMPREPLY=($(compgen -c -- "$cur"))
+                    return
+                fi
+            else
+                local _RUBY_COMMAND_PREFIX=("${bundle_bin[@]}" exec)
+                _command_offset $bundle_command_index
+                return
+            fi
+            ;;
+        gem)
+            case $prev in
+            -e | --edit)
+                COMPREPLY=($(compgen -c -- "$cur"))
+                return;;
+            -t | --test)
+                options="minitest rspec";;
+            esac
+            ;;
+        update)
+            case $prev in
+            --group)
+                __bundle_complete_groups
+                return;;
+            *)
+                options=($(__bundle_exec_ruby 'puts Bundler.definition.specs.to_hash.keys'))
+            esac
+            ;;
+        viz)
+            case $prev in
+            -F | --format)
+                options="dot jpg png svg";;
+            -W | --without)
+                __bundle_complete_groups
+                return;;
+            esac
+            ;;
+        esac
+    fi
+    COMPREPLY=($(compgen -W "${options[*]}" -- "$cur"))
 }
 
 __bundle_get_command() {
@@ -41,25 +179,76 @@ __bundle_get_command() {
         case $arg in
         [^-]*)
             bundle_command=$arg
+            bundle_command_index=$((i + 1))
             return;;
         --version)
-            # command-killer
+            # Command-killer
             bundle_command=-
             return;;
         --help)
             bundle_command=help
+            bundle_command_index=$((i + 1))
             return;;
         esac
     done
 }
 
+# Provides completion for Bundler group names.
+#
+# Multiple groups can be entered, separated either by spaces or by colons.
+# Input is read from $cur, and the result is directly written to $COMPREPLY.
+__bundle_complete_groups() {
+    # Group being currently written
+    local cur_group=${cur##*[ :]}
+    # All groups written before
+    local prefix=${cur%"$cur_group"}
+    local groups=$(__bundle_exec_ruby 'puts Bundler.definition.dependencies.map(&:groups).reduce(:|).map(&:to_s)')
+    if [[ ! $groups ]]; then
+        COMPREPLY=()
+        return
+    fi
+    # Duplicate "default" and anything already in $prefix, so that `uniq`
+    # strips it; groups may be separated by ':', ' ', or '\ '
+    local excluded=$'\ndefault\n'${prefix//[: \'\"\\]/$'\n'}
+    # Include them twice to ensure they are duplicates
+    groups=$groups$excluded$excluded
+    COMPREPLY=($(compgen -W "$(sort <<<"$groups" | uniq -u)" -- "$cur_group"))
+    # Prepend prefix to all entries
+    COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
+    __ltrim_colon_completions "$cur"
+}
 
-complete -F __bundle -o bashdefault -o default bundle
-# vim: ai ft=sh sw=4 sts=2 et
+# __bundle_exec_ruby <script> [args...]
+#
+# Runs a Ruby script with Bundler loaded.
+# Results may be cached.
+__bundle_exec_ruby() {
+    local bundle_bin=(${bundle_bin[@]:-bundle})
+    # Lockfile is inferred here, and might not be correct (for example, when
+    # running on a subdirectory). However, a wrong file path won't be a
+    # cadastrophic mistake; it just means the cache won't be invalidated when
+    # the local gem list changes (but will still invalidate if the command is
+    # run on another directory)
+    local lockfile=$PWD/Gemfile.lock
+    local cachedir=${XDG_CACHE_HOME:-~/.cache}/completion-ruby
+    local cachefile=$cachedir/bundle--exec-ruby
+    # A representation of all arguments with newlines replaced by spaces,
+    # to fit in a single line as a cache identifier
+    local cache_id_line="${bundle_bin[*]} @ $lockfile: ${*//$'\n'/ }"
 
-_bundle_exec_completions()
-{
-    if [[ $COMP_CWORD = 2 ]]; then
-        COMPREPLY=($(compgen -c -- "$2"))
+    if [[ (! -f $lockfile || $cachefile -nt $lockfile) &&
+          $(head -n 1 -- "$cachefile" 2>/dev/null) = "$cache_id_line" ]]; then
+        tail -n +2 -- "$cachefile"
+    else
+        local output=$("${bundle_bin[@]}" exec ruby -e "$@" 2>/dev/null)
+        if [[ $? -eq 0 ]]; then
+            (mkdir -p -- "$cachedir" &&
+             echo "$cache_id_line"$'\n'"$output" >$cachefile) 2>/dev/null
+            echo "$output"
+        fi
     fi
 }
+
+
+complete -F __bundle -o bashdefault -o default bundle
+# vim: ai ft=sh sw=4 sts=4 et

From 8123b1c88798e78c12e795b3e736c9429ac62b73 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Fri, 1 Nov 2019 08:41:37 -0700
Subject: [PATCH 067/388] Adds shlvl segment to powerline themes

---
 themes/powerline-multiline/powerline-multiline.theme.bash | 3 +++
 themes/powerline-naked/powerline-naked.theme.bash         | 3 +++
 themes/powerline-plain/powerline-plain.theme.bash         | 3 +++
 themes/powerline/powerline.base.bash                      | 8 ++++++++
 themes/powerline/powerline.theme.bash                     | 3 +++
 5 files changed, 20 insertions(+)

diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index e90b494e..a70a2025 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -64,6 +64,9 @@ IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
+SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
+SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
+
 POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
 POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
 
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 2a5b7b26..bff10f57 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -60,6 +60,9 @@ IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=254}
 
+SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
+SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 4d539470..a300cab9 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -57,6 +57,9 @@ IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
+SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
+SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index a0f80552..f5cf4f3e 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -162,6 +162,14 @@ function __powerline_aws_profile_prompt {
   fi
 }
 
+function __powerline_shlvl_prompt {
+  if [[ "${SHLVL}" -gt 1 ]]; then
+    local prompt="${SHLVL_THEME_PROMPT_CHAR}"
+    local level=$(( ${SHLVL} - 1))
+    echo "${prompt}${level}|${SHLVL_THEME_PROMPT_COLOR}"
+  fi
+}
+
 function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 26182a82..d4bb387d 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -60,6 +60,9 @@ IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
+SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
+SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command

From 224fc123dcac58fb73d9943d7ce09bd602df6b0a Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Fri, 1 Nov 2019 22:16:14 -0700
Subject: [PATCH 068/388] Updates README files for shlvl segment

---
 themes/powerline-multiline/README.md | 2 ++
 themes/powerline-naked/README.md     | 2 ++
 themes/powerline-plain/README.md     | 2 ++
 themes/powerline/README.md           | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index 965c593a..49ccb9f6 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -9,6 +9,7 @@ A colorful multiline theme, where the first line shows information about your sh
 * Current path
 * Current username and hostname
 * Current time
+* Current shell level
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -61,6 +62,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
+* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 
 Two variables can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index 1f16c296..60bf722f 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -9,6 +9,7 @@ A colorful theme, where shows a lot information about your shell session.
 * Current path
 * Current username and hostname
 * Current time
+* Current shell level
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -59,6 +60,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
+* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 
 A variable can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 6ea21a18..924eb2ac 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -7,6 +7,7 @@ A colorful theme, where shows a lot information about your shell session.
 * Current path
 * Current username and hostname
 * Current time
+* Current shell level
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -57,6 +58,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
+* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 
 A variable can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index acb51d9f..55efa655 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -11,6 +11,7 @@ A colorful theme, where shows a lot information about your shell session.
 * Current path
 * Current username and hostname
 * Current time
+* Current shell level
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -61,6 +62,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
+* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 
 A variable can be defined to set the order of the prompt segments:
 

From f8ae0494e82f75c5521f28cab2cb9607ff105535 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Thu, 31 Oct 2019 22:33:40 -0700
Subject: [PATCH 069/388] Adds dirstack segment to powerline themes

---
 .../powerline-multiline.theme.bash                    |  3 +++
 themes/powerline-naked/powerline-naked.theme.bash     |  3 +++
 themes/powerline-plain/powerline-plain.theme.bash     |  3 +++
 themes/powerline/powerline.base.bash                  | 11 +++++++++++
 themes/powerline/powerline.theme.bash                 |  3 +++
 5 files changed, 23 insertions(+)

diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index a726c8df..d5915da6 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -69,6 +69,9 @@ HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
 SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 
+DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
+DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
+
 POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
 POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
 
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index bff10f57..b8a2ade6 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -63,6 +63,9 @@ HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=254}
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
 SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 
+DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
+DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index a300cab9..9c207a60 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -60,6 +60,9 @@ HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
 SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 
+DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
+DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 058569c2..d33b71c2 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -170,6 +170,17 @@ function __powerline_shlvl_prompt {
   fi
 }
 
+function __powerline_dirstack_prompt {
+  if [[ "${#DIRSTACK[@]}" -gt 1 ]]; then
+    local depth=$(( ${#DIRSTACK[@]} - 1 ))
+    local prompt="${DIRSTACK_THEME_PROMPT_CHAR}"
+    if [[ "${depth}" -ge 2 ]]; then
+      prompt+="${depth}"
+    fi
+    echo "${prompt}|${DIRSTACK_THEME_PROMPT_COLOR}"
+  fi
+}
+
 function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 38e1ef1b..310ffb55 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -64,6 +64,9 @@ HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
 SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 
+DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
+DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command

From e0c0a770d64eae605c4e0ac35e83b2601e38e378 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Fri, 1 Nov 2019 22:32:25 -0700
Subject: [PATCH 070/388] Updates README files for dirstack segment

---
 themes/powerline-multiline/README.md | 2 ++
 themes/powerline-naked/README.md     | 2 ++
 themes/powerline-plain/README.md     | 2 ++
 themes/powerline/README.md           | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index 604d66aa..856c2261 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -10,6 +10,7 @@ A colorful multiline theme, where the first line shows information about your sh
 * Current username and hostname
 * Current time
 * Current shell level
+* Current dirstack level (`pushd` / `popd`)
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -67,6 +68,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
+* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
 
 Two variables can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index 60bf722f..bc64ad66 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -10,6 +10,7 @@ A colorful theme, where shows a lot information about your shell session.
 * Current username and hostname
 * Current time
 * Current shell level
+* Current dirstack level (`pushd` / `popd`)
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -61,6 +62,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
+* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
 
 A variable can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 924eb2ac..71939323 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -8,6 +8,7 @@ A colorful theme, where shows a lot information about your shell session.
 * Current username and hostname
 * Current time
 * Current shell level
+* Current dirstack level (`pushd` / `popd`)
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -59,6 +60,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
+* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
 
 A variable can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 20d0bdd9..43447fe7 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -12,6 +12,7 @@ A colorful theme, where shows a lot information about your shell session.
 * Current username and hostname
 * Current time
 * Current shell level
+* Current dirstack level (`pushd` / `popd`)
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -67,6 +68,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
+* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
 
 A variable can be defined to set the order of the prompt segments:
 

From ee5e1b63bc314e4930a7f0151a7c784878882bc7 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Sat, 2 Nov 2019 00:07:59 -0700
Subject: [PATCH 071/388] Adds history + command line number to powerline
 themes

---
 themes/powerline-multiline/README.md  | 4 ++++
 themes/powerline-naked/README.md      | 4 ++++
 themes/powerline-plain/README.md      | 4 ++++
 themes/powerline/README.md            | 4 ++++
 themes/powerline/powerline.base.bash  | 8 ++++++++
 themes/powerline/powerline.theme.bash | 6 ++++++
 6 files changed, 30 insertions(+)

diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index 856c2261..23e7b079 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -11,6 +11,8 @@ A colorful multiline theme, where the first line shows information about your sh
 * Current time
 * Current shell level
 * Current dirstack level (`pushd` / `popd`)
+* Current history number
+* Current command number
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -69,6 +71,8 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 * `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
+* `history_number` - Show current history number
+* `command_number` - Show current command number
 
 Two variables can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index bc64ad66..b1ab2d69 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -11,6 +11,8 @@ A colorful theme, where shows a lot information about your shell session.
 * Current time
 * Current shell level
 * Current dirstack level (`pushd` / `popd`)
+* Current history number
+* Current command number
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -63,6 +65,8 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 * `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
+* `history_number` - Show current history number
+* `command_number` - Show current command number
 
 A variable can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 71939323..f5da2095 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -9,6 +9,8 @@ A colorful theme, where shows a lot information about your shell session.
 * Current time
 * Current shell level
 * Current dirstack level (`pushd` / `popd`)
+* Current history number
+* Current command number
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -61,6 +63,8 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 * `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
+* `history_number` - Show current history number
+* `command_number` - Show current command number
 
 A variable can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 43447fe7..481806ec 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -13,6 +13,8 @@ A colorful theme, where shows a lot information about your shell session.
 * Current time
 * Current shell level
 * Current dirstack level (`pushd` / `popd`)
+* Current history number
+* Current command number
 * An indicator when connected by SSH
 * An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
 * An indicator when the current shell is inside the Vim editor
@@ -69,6 +71,8 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
 * `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
+* `history_number` - Show current history number
+* `command_number` - Show current command number
 
 A variable can be defined to set the order of the prompt segments:
 
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index d33b71c2..eeead59b 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -181,6 +181,14 @@ function __powerline_dirstack_prompt {
   fi
 }
 
+function __powerline_history_number_prompt {
+  echo "${HISTORY_NUMBER_THEME_PROMPT_CHAR}\!|${HISTORY_NUMBER_THEME_PROMPT_COLOR}"
+}
+
+function __powerline_command_number_prompt {
+  echo "${COMMAND_NUMBER_THEME_PROMPT_CHAR}\#|${COMMAND_NUMBER_THEME_PROMPT_COLOR}"
+}
+
 function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 310ffb55..a6de0003 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -67,6 +67,12 @@ SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
 DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
 
+HISTORY_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_HISTORY_NUMBER_COLOR:="0"}
+HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
+
+COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=0}
+COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command

From e8ac112583cb0119759c11f5e362acd3f8acd50a Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Sun, 3 Nov 2019 13:51:28 -0800
Subject: [PATCH 072/388] Adds history/command vars to remaining themes

---
 themes/powerline-multiline/powerline-multiline.theme.bash | 6 ++++++
 themes/powerline-naked/powerline-naked.theme.bash         | 6 ++++++
 themes/powerline-plain/powerline-plain.theme.bash         | 6 ++++++
 themes/powerline/powerline.theme.bash                     | 2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index d5915da6..f91020ad 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -72,6 +72,12 @@ SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
 DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
 
+HISTORY_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_HISTORY_NUMBER_COLOR:=0}
+HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
+
+COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=0}
+COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
+
 POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
 POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
 
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index b8a2ade6..2ec59747 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -66,6 +66,12 @@ SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
 DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
 
+HISTORY_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_HISTORY_NUMBER_COLOR:=254}
+HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
+
+COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=254}
+COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 9c207a60..c6334252 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -63,6 +63,12 @@ SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
 DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
 
+HISTORY_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_HISTORY_NUMBER_COLOR:=0}
+HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
+
+COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=0}
+COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index a6de0003..8ba1adf7 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -67,7 +67,7 @@ SHLVL_THEME_PROMPT_CHAR=${POWERLINE_SHLVL_CHAR:="§"}
 DIRSTACK_THEME_PROMPT_COLOR=${POWERLINE_DIRSTACK_COLOR:=${CWD_THEME_PROMPT_COLOR}}
 DIRSTACK_THEME_PROMPT_CHAR=${POWERLINE_DIRSTACK_CHAR:="←"}
 
-HISTORY_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_HISTORY_NUMBER_COLOR:="0"}
+HISTORY_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_HISTORY_NUMBER_COLOR:=0}
 HISTORY_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_HISTORY_NUMBER_CHAR:="#"}
 
 COMMAND_NUMBER_THEME_PROMPT_COLOR=${POWERLINE_COMMAND_NUMBER_COLOR:=0}

From 546b4e948fc4ce67762bb604fd8f7dea15ce5b8f Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 6 Nov 2019 14:41:15 -0800
Subject: [PATCH 073/388] Adds last segment prompt char to powerline default
 theme

---
 themes/powerline-naked/powerline-naked.theme.bash | 1 +
 themes/powerline/powerline.base.bash              | 1 +
 themes/powerline/powerline.theme.bash             | 1 +
 3 files changed, 3 insertions(+)

diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 2ec59747..bc52a054 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -4,6 +4,7 @@
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
 POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
+POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR=""
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=240}
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index eeead59b..a348cd7a 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -233,6 +233,7 @@ function __powerline_prompt_command {
   done
 
   [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
+  [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]] && LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}${normal}"
   [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"
 
   PS1="${LEFT_PROMPT} "
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 8ba1adf7..9bcd90b1 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -5,6 +5,7 @@
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
 POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
 POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
+POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR=${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR:=""}
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}

From 8d5233ac19ed29269ef2b03ec9b38a209af7867d Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 6 Nov 2019 18:11:53 -0800
Subject: [PATCH 074/388] Fixes prompt color

---
 themes/powerline/powerline.base.bash | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index a348cd7a..60339ed0 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -233,8 +233,15 @@ function __powerline_prompt_command {
   done
 
   [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
-  [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]] && LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}${normal}"
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"
+
+  # By default we try to match the prompt to the adjacent segment's background color,
+  # but when part of the prompt exists within that segment, we instead match the foreground color.
+  local prompt_color="$(set_color ${LAST_SEGMENT_COLOR} -)"
+  if [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]]; then
+    LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
+    prompt_color="${normal}"
+  fi
+  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="${prompt_color}${separator_char}${normal}"
 
   PS1="${LEFT_PROMPT} "
 

From 920a97a2649655e89efc2e8f10bf8c20c4203f58 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Sun, 3 Nov 2019 13:01:22 -0800
Subject: [PATCH 075/388] Adds compact support to powerline themes

---
 themes/powerline-multiline/README.md          | 22 +++++++
 .../powerline-multiline.base.bash             | 65 ++++++++++++++-----
 .../powerline-multiline.theme.bash            |  7 ++
 themes/powerline-naked/README.md              | 15 +++++
 .../powerline-naked/powerline-naked.base.bash | 25 +++++--
 .../powerline-naked.theme.bash                |  7 ++
 themes/powerline-plain/README.md              | 15 +++++
 .../powerline-plain/powerline-plain.base.bash | 39 +++++++++--
 .../powerline-plain.theme.bash                |  7 ++
 themes/powerline/README.md                    | 15 +++++
 themes/powerline/powerline.base.bash          | 39 ++++++++---
 themes/powerline/powerline.theme.bash         |  7 ++
 12 files changed, 230 insertions(+), 33 deletions(-)

diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index 23e7b079..cbc585e2 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -94,3 +94,25 @@ This can be done by setting the `POWERLINE_PADDING` variable before Bash-it is l
 ```bash
 export POWERLINE_PADDING=3
 ```
+
+### Compact Settings
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+| Variable                             | Description
+|--------------------------------------|------------
+|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
+|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
+|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
+|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
+|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
+|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
+
+The default value for all settings is `0` (disabled). Use `1` to enable.
+
+**Multiline Mode Right Prompt**
+
+For the purposes of the `Compact` settings, the segments within the **Right Prompt** are considered to run "right-to-left", i.e.:
+
+* The **right-most** segment is considered to be the `"first"` segment, while the **left-most** segment is considered to be the `"last"`
+* The space to the **right** of the separator character is considered to be `"before"`, while the space to the **left** is considered to be `"after"`
diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index ea8b2624..cbd30bff 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -8,32 +8,50 @@ function __powerline_right_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
-  local separator_char="${POWERLINE_RIGHT_SEPARATOR}"
-  local separator_char_soft="${POWERLINE_RIGHT_SEPARATOR_SOFT}"
   local padding="${POWERLINE_PADDING}"
-  local separator_color=""
+  local pad_before_segment=" "
 
   if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
-    separator_char="${POWERLINE_RIGHT_END}"
-    separator_color="$(set_color ${params[1]} -)"
+    if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+    RIGHT_PROMPT+="$(set_color ${params[1]} -)${POWERLINE_RIGHT_END}${normal}"
+    (( padding += 1 ))
   else
-      if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
-        separator_color="$(set_color - ${LAST_SEGMENT_COLOR})"
-        separator_char=${separator_char_soft}
-      else
-        separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})"
-      fi
+    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+    # Since the previous segment wasn't the last segment, add padding, if needed
+    #
+    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -eq 0 ]]; then
+      RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+      (( padding += 1 ))
+    fi
+    if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
+      RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR_SOFT}${normal}"
+    else
+      RIGHT_PROMPT+="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR}${normal}"
+    fi
     (( padding += 1 ))
   fi
-  RIGHT_PROMPT+="${separator_color}${separator_char}${normal}$(set_color - ${params[1]}) ${params[0]} ${normal}$(set_color - ${COLOR})${normal}"
-  RIGHT_PROMPT_LENGTH=$(( ${#params[0]} + RIGHT_PROMPT_LENGTH + padding ))
+
+  RIGHT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
+
+  (( padding += ${#pad_before_segment} ))
+  (( padding += ${#params[0]} ))
+
+  (( RIGHT_PROMPT_LENGTH += padding ))
   LAST_SEGMENT_COLOR="${params[1]}"
   (( SEGMENTS_AT_RIGHT += 1 ))
 }
 
+function __powerline_right_first_segment_padding {
+  RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+  (( RIGHT_PROMPT_LENGTH += 1 ))
+}
+
 function __powerline_prompt_command {
   local last_status="$?" ## always the first
-  local separator_char="${POWERLINE_LEFT_SEPARATOR}"
   local move_cursor_rightmost='\033[500C'
 
   LEFT_PROMPT=""
@@ -48,6 +66,11 @@ function __powerline_prompt_command {
     local info="$(__powerline_${segment}_prompt)"
     [[ -n "${info}" ]] && __powerline_left_segment "${info}"
   done
+
+  if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+    __powerline_left_last_segment_padding
+  fi
+
   [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${POWERLINE_LEFT_END}${normal}"
 
   ## right prompt ##
@@ -57,12 +80,22 @@ function __powerline_prompt_command {
       local info="$(__powerline_${segment}_prompt)"
       [[ -n "${info}" ]] && __powerline_right_segment "${info}"
     done
+
+    if [[ -n "${RIGHT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -eq 0 ]]; then
+      __powerline_right_first_segment_padding
+    fi
+
     RIGHT_PAD=$(printf "%.s " $(seq 1 $RIGHT_PROMPT_LENGTH))
     LEFT_PROMPT+="${RIGHT_PAD}${move_cursor_rightmost}"
-    LEFT_PROMPT+="\033[${RIGHT_PROMPT_LENGTH}D"
+    LEFT_PROMPT+="\033[$(( ${#RIGHT_PAD} - 1 ))D"
   fi
 
-  PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt ${last_status})${PROMPT_CHAR} "
+  local prompt="${PROMPT_CHAR}"
+  if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+    prompt+=" "
+  fi
+
+  PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt ${last_status})${prompt}"
 
   ## cleanup ##
   unset LAST_SEGMENT_COLOR \
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index f91020ad..f76c5969 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -11,6 +11,13 @@ POWERLINE_LEFT_END=${POWERLINE_LEFT_END:=""}
 POWERLINE_RIGHT_END=${POWERLINE_RIGHT_END:=""}
 POWERLINE_PADDING=${POWERLINE_PADDING:=2}
 
+POWERLINE_COMPACT=${POWERLINE_COMPACT:=0}
+POWERLINE_COMPACT_BEFORE_SEPARATOR=${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
 USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index b1ab2d69..296c30ab 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -73,3 +73,18 @@ A variable can be defined to set the order of the prompt segments:
     POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
 
 The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+### Compact Settings
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+| Variable                             | Description
+|--------------------------------------|------------
+|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
+|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
+|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
+|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
+|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
+|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
+
+The default value for all settings is `0` (disabled). Use `1` to enable.
diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash
index b97c93cf..16b633be 100644
--- a/themes/powerline-naked/powerline-naked.base.bash
+++ b/themes/powerline-naked/powerline-naked.base.bash
@@ -4,13 +4,30 @@ function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
-  local separator_char="${POWERLINE_LEFT_SEPARATOR}"
   local separator=""
+  local pad_before_segment=" "
 
-  if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
-    separator="${separator_char}"
+  if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
+    if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+  else
+    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+    # Since the previous segment wasn't the last segment, add padding, if needed
+    #
+    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
+      LEFT_PROMPT+=" "
+    fi
+    LEFT_PROMPT+="${POWERLINE_LEFT_SEPARATOR}"
   fi
-  LEFT_PROMPT+="${separator}$(set_color ${params[1]} -) ${params[0]} ${normal}"
+
+  LEFT_PROMPT+="$(set_color ${params[1]} -)${pad_before_segment}${params[0]}${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
   (( SEGMENTS_AT_LEFT += 1 ))
 }
+
+function __powerline_left_last_segment_padding {
+  LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -) ${normal}"
+}
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index bc52a054..dfa3eb1d 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -6,6 +6,13 @@ PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
 POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
 POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR=""
 
+POWERLINE_COMPACT=${POWERLINE_COMPACT:=0}
+POWERLINE_COMPACT_BEFORE_SEPARATOR=${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=240}
 USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index f5da2095..2470a718 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -71,3 +71,18 @@ A variable can be defined to set the order of the prompt segments:
     POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
 
 The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+### Compact Settings
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+| Variable                             | Description
+|--------------------------------------|------------
+|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
+|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
+|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
+|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
+|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
+|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
+
+The default value for all settings is `0` (disabled). Use `1` to enable.
diff --git a/themes/powerline-plain/powerline-plain.base.bash b/themes/powerline-plain/powerline-plain.base.bash
index 5558e0eb..37b4ff50 100644
--- a/themes/powerline-plain/powerline-plain.base.bash
+++ b/themes/powerline-plain/powerline-plain.base.bash
@@ -4,15 +4,34 @@ function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
+  local pad_before_segment=" "
 
-  LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${normal}"
+  if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
+    if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+  else
+    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+    # Since the previous segment wasn't the last segment, add padding, if needed
+    #
+    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
+      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+    fi
+  fi
+
+  LEFT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
+  (( SEGMENTS_AT_LEFT += 1 ))
 }
 
 function __powerline_prompt_command {
   local last_status="$?" ## always the first
 
   LEFT_PROMPT=""
+  SEGMENTS_AT_LEFT=0
+  LAST_SEGMENT_COLOR=""
 
   _save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
@@ -21,11 +40,21 @@ function __powerline_prompt_command {
     local info="$(__powerline_${segment}_prompt)"
     [[ -n "${info}" ]] && __powerline_left_segment "${info}"
   done
-  [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -) ${normal}"
 
-  PS1="${LEFT_PROMPT} "
+  [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
+
+  if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+    __powerline_left_last_segment_padding
+  fi
+
+  if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+    LEFT_PROMPT+=" "
+  fi
+
+  PS1="${LEFT_PROMPT}"
 
   ## cleanup ##
-  unset LEFT_PROMPT
+  unset LAST_SEGMENT_COLOR \
+        LEFT_PROMPT \
+        SEGMENTS_AT_LEFT
 }
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index c6334252..3ead67fe 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -6,6 +6,13 @@ USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:="⌁ "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
 USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
 
+POWERLINE_COMPACT=${POWERLINE_COMPACT:=0}
+POWERLINE_COMPACT_BEFORE_SEPARATOR=${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="ⓔ "}
 PYTHON_VENV_THEME_PROMPT_COLOR=${POWERLINE_PYTHON_VENV_COLOR:=35}
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 481806ec..2076336f 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -79,3 +79,18 @@ A variable can be defined to set the order of the prompt segments:
     POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
 
 The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+### Compact Settings
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+| Variable                             | Description
+|--------------------------------------|------------
+|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
+|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
+|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
+|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
+|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
+|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
+
+The default value for all settings is `0` (disabled). Use `1` to enable.
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 60339ed0..c3fac913 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -193,22 +193,37 @@ function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
-  local separator_char="${POWERLINE_LEFT_SEPARATOR}"
-  local separator_char_soft="${POWERLINE_LEFT_SEPARATOR_SOFT}"
-  local separator=""
+  local pad_before_segment=" "
 
-  if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
+  if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
+    if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+  else
+    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+    # Since the previous segment wasn't the last segment, add padding, if needed
+    #
+    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
+      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+    fi
     if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
-      separator="$(set_color - ${LAST_SEGMENT_COLOR})${separator_char_soft}${normal}"
+      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_SEPARATOR_SOFT}${normal}"
     else
-      separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
+      LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${POWERLINE_LEFT_SEPARATOR}${normal}"
     fi
   fi
-  LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${normal}"
+
+  LEFT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
   (( SEGMENTS_AT_LEFT += 1 ))
 }
 
+function __powerline_left_last_segment_padding {
+  LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+}
+
 function __powerline_last_status_prompt {
   [[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
 }
@@ -234,6 +249,10 @@ function __powerline_prompt_command {
 
   [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
 
+  if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+    __powerline_left_last_segment_padding
+  fi
+
   # By default we try to match the prompt to the adjacent segment's background color,
   # but when part of the prompt exists within that segment, we instead match the foreground color.
   local prompt_color="$(set_color ${LAST_SEGMENT_COLOR} -)"
@@ -243,7 +262,11 @@ function __powerline_prompt_command {
   fi
   [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="${prompt_color}${separator_char}${normal}"
 
-  PS1="${LEFT_PROMPT} "
+  if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+    LEFT_PROMPT+=" "
+  fi
+
+  PS1="${LEFT_PROMPT}"
 
   ## cleanup ##
   unset LAST_SEGMENT_COLOR \
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 9bcd90b1..f3ef9a32 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -7,6 +7,13 @@ POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
 POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
 POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR=${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR:=""}
 
+POWERLINE_COMPACT=${POWERLINE_COMPACT:=0}
+POWERLINE_COMPACT_BEFORE_SEPARATOR=${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
+POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
 USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}

From 00ef69e99c1e54d0612d0398e4161bcaa5933a89 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Dec 2019 12:06:52 -0800
Subject: [PATCH 076/388] Only apply POWERLINE_PADDING once

---
 themes/powerline-multiline/powerline-multiline.base.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index cbd30bff..7ae33f86 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -8,7 +8,7 @@ function __powerline_right_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
-  local padding="${POWERLINE_PADDING}"
+  local padding=0
   local pad_before_segment=" "
 
   if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
@@ -56,7 +56,7 @@ function __powerline_prompt_command {
 
   LEFT_PROMPT=""
   RIGHT_PROMPT=""
-  RIGHT_PROMPT_LENGTH=0
+  RIGHT_PROMPT_LENGTH=${POWERLINE_PADDING}
   SEGMENTS_AT_LEFT=0
   SEGMENTS_AT_RIGHT=0
   LAST_SEGMENT_COLOR=""

From b5f666d467f6ddb7ed62da23cb070649e162a2ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damien=20MASCR=C3=89?= <damienmascre@free.fr>
Date: Tue, 7 Jan 2020 13:20:01 +0100
Subject: [PATCH 077/388] Corrects the inclusion file list by properly
 interpreting the paths specified in the Include directive of the ssh_config,
 aka paths relative to the ~/.ssh folder.

---
 completion/available/ssh.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/ssh.completion.bash b/completion/available/ssh.completion.bash
index 42186e81..41d16243 100644
--- a/completion/available/ssh.completion.bash
+++ b/completion/available/ssh.completion.bash
@@ -15,7 +15,7 @@ _sshcomplete() {
     for fl in "$HOME/.ssh/config" \
         $(grep "^\s*Include" "$HOME/.ssh/config" | 
             awk '{for (i=2; i<=NF; i++) print $i}' | 
-            sed "s|^~/|$HOME/|")
+            sed -re "s|^([^/~])|$HOME/.ssh/\1|" -e "s|^~/|$HOME/|")
     do
         if [ -r "$fl" ]; then
             COMPREPLY=( ${COMPREPLY[@]} $(compgen -W "$(grep -i ^Host "$fl" |grep -v '[*!]' | awk '{for (i=2; i<=NF; i++) print $i}' )" ${OPTIONS}) )

From d85a2544299357719859560f3175925049b8ab9e Mon Sep 17 00:00:00 2001
From: Hongyi Zhao <hongyi.zhao@gmail.com>
Date: Thu, 9 Jan 2020 23:20:28 +0800
Subject: [PATCH 078/388] Fix the completion for pip/pip3

---
 completion/available/pip.completion.bash  | 13 ++-----------
 completion/available/pip3.completion.bash | 13 ++-----------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/completion/available/pip.completion.bash b/completion/available/pip.completion.bash
index ad3abb7e..24494df7 100644
--- a/completion/available/pip.completion.bash
+++ b/completion/available/pip.completion.bash
@@ -1,11 +1,2 @@
-
-# pip bash completion start
-_pip_completion()
-{
-    COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
-                   COMP_CWORD=$COMP_CWORD \
-                   PIP_AUTO_COMPLETE=1 $1 ) )
-}
-complete -o default -F _pip_completion pip
-# pip bash completion end
-
+# https://pip.pypa.io/en/stable/user_guide/#command-completion
+eval "$(pip completion --bash)"
diff --git a/completion/available/pip3.completion.bash b/completion/available/pip3.completion.bash
index 1800756b..68245ac1 100644
--- a/completion/available/pip3.completion.bash
+++ b/completion/available/pip3.completion.bash
@@ -1,11 +1,2 @@
-
-# pip bash completion start
-_pip_completion()
-{
-    COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
-                   COMP_CWORD=$COMP_CWORD \
-                   PIP_AUTO_COMPLETE=1 $1 ) )
-}
-complete -o default -F _pip_completion pip3
-# pip bash completion end
-
+# https://pip.pypa.io/en/stable/user_guide/#command-completion
+eval "$(pip3 completion --bash)"

From d54577f992ae8bd3767e6d50dd828bcb934d1a60 Mon Sep 17 00:00:00 2001
From: Hongyi Zhao <hongyi.zhao@gmail.com>
Date: Thu, 9 Jan 2020 23:41:04 +0800
Subject: [PATCH 079/388] touch up modified:  
 completion/available/pip.completion.bash modified:  
 completion/available/pip3.completion.bash

---
 completion/available/pip.completion.bash  | 10 +++++++++-
 completion/available/pip3.completion.bash | 11 ++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/completion/available/pip.completion.bash b/completion/available/pip.completion.bash
index 24494df7..618909ad 100644
--- a/completion/available/pip.completion.bash
+++ b/completion/available/pip.completion.bash
@@ -1,2 +1,10 @@
 # https://pip.pypa.io/en/stable/user_guide/#command-completion
-eval "$(pip completion --bash)"
+# Of course, you should first install the pip, say on Debian:
+# sudo apt-get install python-pip
+# sudo apt-get install python3-pip
+# If the pip package is installed within virtual environments, say, python managed by pyenv,
+# you should first initilization the corresponding environment.
+# So that the pip/pip3 is in system's path.
+if command -v pip >/dev/null; then
+  eval "$(pip completion --bash)"
+fi
diff --git a/completion/available/pip3.completion.bash b/completion/available/pip3.completion.bash
index 68245ac1..599e96e5 100644
--- a/completion/available/pip3.completion.bash
+++ b/completion/available/pip3.completion.bash
@@ -1,2 +1,11 @@
 # https://pip.pypa.io/en/stable/user_guide/#command-completion
-eval "$(pip3 completion --bash)"
+# Of course, you should first install the pip, say on Debian:
+# sudo apt-get install python-pip
+# sudo apt-get install python3-pip
+# If the pip package is installed within virtual environments, say, python managed by pyenv,
+# you should first initilization the corresponding environment.
+# So that the pip/pip3 is in system's path.
+if command -v pip3 >/dev/null; then
+  eval "$(pip3 completion --bash)"
+fi
+

From a9a94e1cd23e565b98760b9cfc9b4e98d64c890b Mon Sep 17 00:00:00 2001
From: Scott Jackson <scottmmjackson@gmail.com>
Date: Wed, 22 Jan 2020 16:42:21 -0500
Subject: [PATCH 080/388] Make zork theme not choke on strange characters

---
 themes/zork/zork.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/zork/zork.theme.bash b/themes/zork/zork.theme.bash
index 07f30e12..905d655b 100644
--- a/themes/zork/zork.theme.bash
+++ b/themes/zork/zork.theme.bash
@@ -81,7 +81,7 @@ prompt() {
 
     if [ -n "$VIRTUAL_ENV" ]
     then
-        ve=`basename $VIRTUAL_ENV`;
+        ve=`basename "$VIRTUAL_ENV"`;
     fi
 
     # nice prompt

From d8d6109e432ab6008b89f02630b8e9b9f21ed62a Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Thu, 23 Jan 2020 08:36:53 +0100
Subject: [PATCH 081/388] Fix macOS sed in SSH completion

See here for details: https://github.com/Bash-it/bash-it/commit/b5f666d467f6ddb7ed62da23cb070649e162a2ed
---
 completion/available/ssh.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/ssh.completion.bash b/completion/available/ssh.completion.bash
index 41d16243..4c47277b 100644
--- a/completion/available/ssh.completion.bash
+++ b/completion/available/ssh.completion.bash
@@ -15,7 +15,7 @@ _sshcomplete() {
     for fl in "$HOME/.ssh/config" \
         $(grep "^\s*Include" "$HOME/.ssh/config" | 
             awk '{for (i=2; i<=NF; i++) print $i}' | 
-            sed -re "s|^([^/~])|$HOME/.ssh/\1|" -e "s|^~/|$HOME/|")
+            sed -Ee "s|^([^/~])|$HOME/.ssh/\1|" -e "s|^~/|$HOME/|")
     do
         if [ -r "$fl" ]; then
             COMPREPLY=( ${COMPREPLY[@]} $(compgen -W "$(grep -i ^Host "$fl" |grep -v '[*!]' | awk '{for (i=2; i<=NF; i++) print $i}' )" ${OPTIONS}) )

From 8472675007a88164fe4928fee391056e297f52ae Mon Sep 17 00:00:00 2001
From: Scott Jackson <scottmmjackson@gmail.com>
Date: Fri, 24 Jan 2020 10:06:19 -0500
Subject: [PATCH 082/388] fix ramses, mairan, and agnoster shell quoting with
 virtual env

---
 themes/agnoster/agnoster.theme.bash | 3 ++-
 themes/mairan/mairan.theme.bash     | 2 +-
 themes/ramses/ramses.theme.bash     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/themes/agnoster/agnoster.theme.bash b/themes/agnoster/agnoster.theme.bash
index dae991cf..0edd931f 100644
--- a/themes/agnoster/agnoster.theme.bash
+++ b/themes/agnoster/agnoster.theme.bash
@@ -210,7 +210,8 @@ prompt_virtualenv() {
     if [[ -n $VIRTUAL_ENV ]]; then
         color=cyan
         prompt_segment $color $PRIMARY_FG
-        prompt_segment $color white "$(basename $VIRTUAL_ENV)"
+	ve=`basename "$VIRTUAL_ENV"`
+        prompt_segment $color white "$ve"
     fi
 }
 
diff --git a/themes/mairan/mairan.theme.bash b/themes/mairan/mairan.theme.bash
index 5c5dfef1..e6728824 100644
--- a/themes/mairan/mairan.theme.bash
+++ b/themes/mairan/mairan.theme.bash
@@ -109,7 +109,7 @@ prompt() {
 
     if [ -n "$VIRTUAL_ENV" ]
     then
-        ve=`basename $VIRTUAL_ENV`;
+        ve=`basename "$VIRTUAL_ENV"`;
     fi
 
     # nice prompt
diff --git a/themes/ramses/ramses.theme.bash b/themes/ramses/ramses.theme.bash
index 37fd00f1..83ab810f 100644
--- a/themes/ramses/ramses.theme.bash
+++ b/themes/ramses/ramses.theme.bash
@@ -81,7 +81,7 @@ prompt() {
 
     if [ -n "$VIRTUAL_ENV" ]
     then
-        ve=`basename $VIRTUAL_ENV`;
+        ve=`basename "$VIRTUAL_ENV"`;
     fi
 
     # nice prompt

From 10032b837076acd19a6345dd35ba69843e9b69f6 Mon Sep 17 00:00:00 2001
From: Scott Jackson <scottmmjackson@gmail.com>
Date: Fri, 24 Jan 2020 10:07:19 -0500
Subject: [PATCH 083/388] looks like agnoster uses spaces instead of tabs.

---
 themes/agnoster/agnoster.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster/agnoster.theme.bash b/themes/agnoster/agnoster.theme.bash
index 0edd931f..06f73c02 100644
--- a/themes/agnoster/agnoster.theme.bash
+++ b/themes/agnoster/agnoster.theme.bash
@@ -210,7 +210,7 @@ prompt_virtualenv() {
     if [[ -n $VIRTUAL_ENV ]]; then
         color=cyan
         prompt_segment $color $PRIMARY_FG
-	ve=`basename "$VIRTUAL_ENV"`
+        ve=`basename "$VIRTUAL_ENV"`
         prompt_segment $color white "$ve"
     fi
 }

From 41059a5b152f400474dbdd59a18581675b078e86 Mon Sep 17 00:00:00 2001
From: 1pav <60271007+1pav@users.noreply.github.com>
Date: Fri, 24 Jan 2020 22:58:52 +0100
Subject: [PATCH 084/388] Port of Oh My Zsh's Bira theme

---
 themes/bira/README.md       |  8 ++++++++
 themes/bira/bira.theme.bash | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 themes/bira/README.md
 create mode 100644 themes/bira/bira.theme.bash

diff --git a/themes/bira/README.md b/themes/bira/README.md
new file mode 100644
index 00000000..2438778e
--- /dev/null
+++ b/themes/bira/README.md
@@ -0,0 +1,8 @@
+# Bira
+
+This is a port of Oh My Zsh's ['Bira'](https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/bira.zsh-theme) theme. It looks the same as the original, except for the following changes:
+
+- Exit code of last command is not shown
+- More informative git prompt (if you want to keep it minimal, please read: https://github.com/Bash-it/bash-it#git-prompt)
+- Position and colour of virtualenv prompt
+- No ruby version prompt
diff --git a/themes/bira/bira.theme.bash b/themes/bira/bira.theme.bash
new file mode 100644
index 00000000..ad1db5c6
--- /dev/null
+++ b/themes/bira/bira.theme.bash
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+SCM_THEME_PROMPT_PREFIX=" ${yellow}‹"
+SCM_THEME_PROMPT_SUFFIX="›${reset_color}"
+
+VIRTUALENV_THEME_PROMPT_PREFIX=" ${cyan}‹"
+VIRTUALENV_THEME_PROMPT_SUFFIX="›${reset_color}"
+
+bold="\[\e[1m\]"
+
+if [ ${UID} -eq 0 ]; then
+  user_host="${bold_red}\u@\h${normal}${reset_color}"
+else
+  user_host="${bold_green}\u@\h${normal}${reset_color}"
+fi
+
+function prompt_command() {
+  local current_dir=" ${bold_blue}\w${normal}${reset_color}"
+  PS1="╭─${user_host}${current_dir}$(virtualenv_prompt)$(scm_prompt_info)\n╰─${bold}\\$ ${normal}"
+}
+
+safe_append_prompt_command prompt_command

From 036c26dbed157b210d303efb6c187693f4361ea4 Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Mon, 3 Feb 2020 11:43:24 -0700
Subject: [PATCH 085/388] Update jump plugin

- remove z plugin
- remove fasd plugin
- update test that referenced fsad

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 lib/search.bash                    |   4 +-
 plugins/available/fasd.plugin.bash |  34 -------
 plugins/available/jump.plugin.bash |   4 +-
 plugins/available/z.plugin.bash    | 153 -----------------------------
 test/lib/search.bats               |   2 +-
 5 files changed, 5 insertions(+), 192 deletions(-)
 delete mode 100755 plugins/available/fasd.plugin.bash
 delete mode 100644 plugins/available/z.plugin.bash

diff --git a/lib/search.bash b/lib/search.bash
index 1c487a3e..58f98904 100755
--- a/lib/search.bash
+++ b/lib/search.bash
@@ -134,14 +134,14 @@ ${echo_underline_yellow}EXAMPLES${echo_normal}
 
          ${echo_bold_green}❯ bash-it search git${echo_bold_blue}
                ${echo_bold_yellow}aliases:  ${echo_bold_green}git ${echo_normal}gitsvn
-               ${echo_bold_yellow}plugins:  ${echo_normal}autojump fasd ${echo_bold_green}git ${echo_normal}git-subrepo jgitflow jump
+               ${echo_bold_yellow}plugins:  ${echo_normal}autojump ${echo_bold_green}git ${echo_normal}git-subrepo jgitflow jump
            ${echo_bold_yellow}completions:  ${echo_bold_green}git ${echo_normal}git_flow git_flow_avh${echo_normal}
 
    You can exclude some terms by prefixing a term with a minus, eg:
 
          ${echo_bold_green}❯ bash-it search git -flow -svn${echo_bold_blue}
                ${echo_bold_yellow}aliases:  ${echo_normal}git
-               ${echo_bold_yellow}plugins:  ${echo_normal}autojump fasd git git-subrepo jump
+               ${echo_bold_yellow}plugins:  ${echo_normal}autojump git git-subrepo jump
            ${echo_bold_yellow}completions:  ${echo_normal}git${echo_normal}
 
    Finally, if you prefix a term with '@' symbol, that indicates an exact
diff --git a/plugins/available/fasd.plugin.bash b/plugins/available/fasd.plugin.bash
deleted file mode 100755
index 13421767..00000000
--- a/plugins/available/fasd.plugin.bash
+++ /dev/null
@@ -1,34 +0,0 @@
-cite about-plugin
-about-plugin 'initialize fasd (see https://github.com/clvv/fasd)'
-
-__init_fasd() {
-  command -v fasd &> /dev/null
-  if [ $? -eq 1 ]; then
-    echo -e "You must install fasd before you can use this plugin"
-    echo -e "See: https://github.com/clvv/fasd"
-  else
-    eval "$(fasd --init posix-alias)"
-
-    # Note, this is a custom bash-hook to ensure that the last exit status
-    # is maintained even while this hook is in place. This code can be
-    # removed once PR #72 is merged into fasd.
-    #
-    # See: https://github.com/clvv/fasd/pull/72
-    _fasd_prompt_func() {
-      local _exit_code="$?"
-      eval "fasd --proc $(fasd --sanitize $(history 1 | \
-        sed "s/^[ ]*[0-9]*[ ]*//"))" >> "/dev/null" 2>&1
-      return $_exit_code
-    }
-
-    # add bash hook
-    case $PROMPT_COMMAND in
-      *_fasd_prompt_func*) ;;
-      "") PROMPT_COMMAND="_fasd_prompt_func";;
-      *) PROMPT_COMMAND="_fasd_prompt_func;$PROMPT_COMMAND";;
-    esac
-    eval "$(fasd --init bash-ccomp bash-ccomp-install)"
-  fi
-}
-
-__init_fasd
diff --git a/plugins/available/jump.plugin.bash b/plugins/available/jump.plugin.bash
index bc6f85e1..3c1f20a6 100755
--- a/plugins/available/jump.plugin.bash
+++ b/plugins/available/jump.plugin.bash
@@ -1,9 +1,9 @@
 cite about-plugin
-about-plugin 'initialize jump (see https://github.com/gsamokovarov/jump)'
+about-plugin 'initialize jump (see https://github.com/gsamokovarov/jump). Add `export JUMP_OPTS="bind=z"` to change keybinding'
 
 __init_jump() {
   command -v jump &> /dev/null || return
-  eval "$(jump shell --bind=z)"
+  eval "$(jump shell bash ${JUMP_OPTS[@]})"
 }
 
 __init_jump
diff --git a/plugins/available/z.plugin.bash b/plugins/available/z.plugin.bash
deleted file mode 100644
index 7cfb7932..00000000
--- a/plugins/available/z.plugin.bash
+++ /dev/null
@@ -1,153 +0,0 @@
-cite about-plugin
-about-plugin 'maintains a jump-list of the directories you actually use'
-about-plugin '                              z is DEPRECATED, use fasd instead'
-
-# INSTALL:
-#   * put something like this in your .bashrc:
-#     . /path/to/z.sh
-#   * cd around for a while to build up the db
-#   * PROFIT!!
-#
-# USE:
-#   * z foo     # goes to most frecent dir matching foo
-#   * z foo bar # goes to most frecent dir matching foo and bar
-#   * z -r foo  # goes to highest ranked dir matching foo
-#   * z -t foo  # goes to most recently accessed dir matching foo
-#   * z -l foo  # list all dirs matching foo (by frecency)
-
-if [ -e "${BASH_IT}/plugins/enabled/fasd.plugin.bash" ] || [ -e "${BASH_IT}/plugins/enabled/*${BASH_IT_LOAD_PRIORITY_SEPARATOR}fasd.plugin.bash" ]; then
-    printf '%s\n' 'sorry, the z plugin is incompatible with the fasd plugin. you may use either, but not both.'
-    return
-fi
-
-z() {
- local datafile="$HOME/.z"
- if [ "$1" = "--add" ]; then
-  # add
-  shift
-  # $HOME isn't worth matching
-  [ "$*" = "$HOME" ] && return
-  awk -v p="$*" -v t="$(date +%s)" -F"|" '
-   BEGIN { rank[p] = 1; time[p] = t }
-   $2 >= 1 {
-    if( $1 == p ) {
-     rank[$1] = $2 + 1
-     time[$1] = t
-    } else {
-     rank[$1] = $2
-     time[$1] = $3
-    }
-    count += $2
-   }
-   END {
-    if( count > 1000 ) {
-     for( i in rank ) print i "|" 0.9*rank[i] "|" time[i] # aging
-    } else for( i in rank ) print i "|" rank[i] "|" time[i]
-   }
-  ' "$datafile" 2>/dev/null > "$datafile.tmp"
-  mv -f "$datafile.tmp" "$datafile"
- elif [ "$1" = "--complete" ]; then
-  # tab completion
-  awk -v q="$2" -F"|" '
-   BEGIN {
-    if( q == tolower(q) ) nocase = 1
-    split(substr(q,3),fnd," ")
-   }
-   {
-    if( system("test -d \"" $1 "\"") ) next
-    if( nocase ) {
-     for( i in fnd ) tolower($1) !~ tolower(fnd[i]) && $1 = ""
-     if( $1 ) print $1
-    } else {
-     for( i in fnd ) $1 !~ fnd[i] && $1 = ""
-     if( $1 ) print $1
-    }
-   }
-  ' "$datafile" 2>/dev/null
- else
-  # list/go
-  while [ "$1" ]; do case "$1" in
-   -h) echo "z [-h][-l][-r][-t] args" >&2; return;;
-   -l) local list=1;;
-   -r) local typ="rank";;
-   -t) local typ="recent";;
-   --) while [ "$1" ]; do shift; local fnd="$fnd $1";done;;
-    *) local fnd="$fnd $1";;
-  esac; local last=$1; shift; done
-  [ "$fnd" ] || local list=1
-  # if we hit enter on a completion just go there
-  [ -d "$last" ] && cd "$last" && return
-  [ -f "$datafile" ] || return
-  local cd="$(awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -v tmpfl="$datafile.tmp" -F"|" '
-   function frecent(rank, time) {
-    dx = t-time
-    if( dx < 3600 ) return rank*4
-    if( dx < 86400 ) return rank*2
-    if( dx < 604800 ) return rank/2
-    return rank/4
-   }
-   function output(files, toopen, override) {
-    if( list ) {
-     if( typ == "recent" ) {
-      cmd = "sort -nr >&2"
-     } else cmd = "sort -n >&2"
-     for( i in files ) if( files[i] ) printf "%-10s %s\n", files[i], i | cmd
-     if( override ) printf "%-10s %s\n", "common:", override > "/dev/stderr"
-    } else {
-     if( override ) toopen = override
-     print toopen
-    }
-   }
-   function common(matches, fnd, nc) {
-    for( i in matches ) {
-     if( matches[i] && (!short || length(i) < length(short)) ) short = i
-    }
-    if( short == "/" ) return
-    for( i in matches ) if( matches[i] && i !~ short ) x = 1
-    if( x ) return
-    if( nc ) {
-     for( i in fnd ) if( tolower(short) !~ tolower(fnd[i]) ) x = 1
-    } else for( i in fnd ) if( short !~ fnd[i] ) x = 1
-    if( !x ) return short
-   }
-   BEGIN { split(q, a, " ") }
-   {
-    if( system("test -d \"" $1 "\"") ) next
-    print $0 >> tmpfl
-    if( typ == "rank" ) {
-     f = $2
-    } else if( typ == "recent" ) {
-     f = t-$3
-    } else f = frecent($2, $3)
-    wcase[$1] = nocase[$1] = f
-    for( i in a ) {
-     if( $1 !~ a[i] ) delete wcase[$1]
-     if( tolower($1) !~ tolower(a[i]) ) delete nocase[$1]
-    }
-    if( wcase[$1] > oldf ) {
-     cx = $1
-     oldf = wcase[$1]
-    } else if( nocase[$1] > noldf ) {
-     ncx = $1
-     noldf = nocase[$1]
-    }
-   }
-   END {
-    if( cx ) {
-     output(wcase, cx, common(wcase, a, 0))
-    } else if( ncx ) output(nocase, ncx, common(nocase, a, 1))
-   }
-  ' "$datafile")"
-  if [ $? -gt 0 ]; then
-   rm -f "$datafile.tmp"
-  else
-   mv -f "$datafile.tmp" "$datafile"
-   [ "$cd" ] && cd "$cd"
-  fi
- fi
-}
-# tab completion
-complete -C 'z --complete "$COMP_LINE"' z
-# populate directory list. avoid clobbering other PROMPT_COMMANDs.
-echo $PROMPT_COMMAND | grep -q "z --add"
-[ $? -gt 0 ] && PROMPT_COMMAND='z --add "$(pwd -P)";'"$PROMPT_COMMAND"
diff --git a/test/lib/search.bats b/test/lib/search.bats
index 56cda073..5bbc8207 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -53,7 +53,7 @@ function local_teardown {
 @test "search: git" {
   run _bash-it-search 'git' --no-color
   assert_line -n 0 '      aliases:  git   gitsvn  '
-  assert_line -n 1 '      plugins:  autojump   fasd   git   git-subrepo   jgitflow   jump  '
+  assert_line -n 1 '      plugins:  autojump   git   git-subrepo   jgitflow   jump  '
   assert_line -n 2 '  completions:  git   git_flow   git_flow_avh  '
 }
 

From b4b4ccfe31b1404123ab19b1eba18740b8e9b207 Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Mon, 3 Feb 2020 12:52:47 -0700
Subject: [PATCH 086/388] Correct bind option

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 plugins/available/jump.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/jump.plugin.bash b/plugins/available/jump.plugin.bash
index 3c1f20a6..74ce232f 100755
--- a/plugins/available/jump.plugin.bash
+++ b/plugins/available/jump.plugin.bash
@@ -1,5 +1,5 @@
 cite about-plugin
-about-plugin 'initialize jump (see https://github.com/gsamokovarov/jump). Add `export JUMP_OPTS="bind=z"` to change keybinding'
+about-plugin 'initialize jump (see https://github.com/gsamokovarov/jump). Add `export JUMP_OPTS="--bind=z"` to change keybinding'
 
 __init_jump() {
   command -v jump &> /dev/null || return

From 6cd634dd85e1d4de22d6a96cc782d2917dc57c4d Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Mon, 3 Feb 2020 15:32:27 -0700
Subject: [PATCH 087/388] Initilize as array in example

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 plugins/available/jump.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/jump.plugin.bash b/plugins/available/jump.plugin.bash
index 74ce232f..f2b34684 100755
--- a/plugins/available/jump.plugin.bash
+++ b/plugins/available/jump.plugin.bash
@@ -1,5 +1,5 @@
 cite about-plugin
-about-plugin 'initialize jump (see https://github.com/gsamokovarov/jump). Add `export JUMP_OPTS="--bind=z"` to change keybinding'
+about-plugin 'initialize jump (see https://github.com/gsamokovarov/jump). Add `export JUMP_OPTS=("--bind=z")` to change keybinding'
 
 __init_jump() {
   command -v jump &> /dev/null || return

From 3f293c253f18d61b2438e76a5ced323089130f74 Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Mon, 3 Feb 2020 15:37:54 -0700
Subject: [PATCH 088/388] Safe array expansion

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 plugins/available/jump.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/jump.plugin.bash b/plugins/available/jump.plugin.bash
index f2b34684..26d6467d 100755
--- a/plugins/available/jump.plugin.bash
+++ b/plugins/available/jump.plugin.bash
@@ -3,7 +3,7 @@ about-plugin 'initialize jump (see https://github.com/gsamokovarov/jump). Add `e
 
 __init_jump() {
   command -v jump &> /dev/null || return
-  eval "$(jump shell bash ${JUMP_OPTS[@]})"
+  eval "$(jump shell bash "${JUMP_OPTS[@]}")"
 }
 
 __init_jump

From b442267d2d353f9761316141e38ac80d92e8018f Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Wed, 5 Feb 2020 15:15:13 -0700
Subject: [PATCH 089/388] Remove vf funcion as fasd unsupported

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 plugins/available/fzf.plugin.bash | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/plugins/available/fzf.plugin.bash b/plugins/available/fzf.plugin.bash
index def60825..4c672bbc 100644
--- a/plugins/available/fzf.plugin.bash
+++ b/plugins/available/fzf.plugin.bash
@@ -37,13 +37,3 @@ fcd() {
                   -o -type d -print 2> /dev/null | fzf +m) &&
   cd "$dir"
 }
-
-vf() {
-  about "Use fasd to search the file to open in vim"
-  group "fzf"
-  param "1: Search term for fasd"
-  example "vf xml"
-
-  local file
-  file="$(fasd -Rfl "$1" | fzf -1 -0 --no-sort +m)" && vi "${file}" || return 1
-}

From 8ccfbd7e0f2ea8cc6deb330cbd16c1ab183a815e Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Wed, 12 Feb 2020 17:26:00 -0600
Subject: [PATCH 090/388] add current working directory as a volume

---
 aliases/available/docker.aliases.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aliases/available/docker.aliases.bash b/aliases/available/docker.aliases.bash
index 52ccc4c6..9f005aa7 100644
--- a/aliases/available/docker.aliases.bash
+++ b/aliases/available/docker.aliases.bash
@@ -33,7 +33,9 @@ alias dkrmflast='docker rm -f $(dklcid)'
 alias dkbash='dkelc'
 alias dkex='docker exec -it ' # Useful to run any commands into container without leaving host
 alias dkri='docker run --rm -i '
+alias dkric='docker run --rm -i -v $PWD:/cwd -w /cwd '
 alias dkrit='docker run --rm -it '
+alias dkritc='docker run --rm -it -v $PWD:/cwd -w /cwd '
 
 # Added more recent cleanup options from newer docker versions
 alias dkip='docker image prune -a -f'

From ca1713d5c9969efd8bf26e6d3fd813652bad8109 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Thu, 13 Feb 2020 08:05:03 -0600
Subject: [PATCH 091/388] add uuid aliases

---
 aliases/available/general.aliases.bash | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 542b76cd..9957befc 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -113,3 +113,8 @@ catt() {
     fi
   done
 }
+
+# uuidgen
+alias uuidu="uuidgen"
+alias uuidl="uuidgen | tr '[:upper:]' '[:lower:]'"
+alias uuid=uuidl # because upper case is like YELLING

From 06878e9e54ca3932a45a49bce75970d7614b8644 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Thu, 13 Feb 2020 08:28:41 -0600
Subject: [PATCH 092/388] add npx aliases

---
 aliases/available/npm.aliases.bash | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/aliases/available/npm.aliases.bash b/aliases/available/npm.aliases.bash
index 2266fe22..f8f64595 100644
--- a/aliases/available/npm.aliases.bash
+++ b/aliases/available/npm.aliases.bash
@@ -2,6 +2,8 @@ cite 'about-alias'
 about-alias 'common npm abbreviations'
 
 # Aliases
+
+# npm
 alias ni='npm install'
 alias nis='npm install --save'
 alias nid='npm install --save-dev'
@@ -20,3 +22,21 @@ alias nud='npm update'
 alias nr='npm run'
 alias nls='npm list --depth=0 2>/dev/null'
 alias nlsg='npm list -g --depth=0 2>/dev/null'
+
+# npx
+alias nx='npx'
+alias nxplease='npx $(fc -ln -1)'
+alias nxn='npx --no-install '
+alias nxp='npx -p '
+alias nxnp='npx --no-install -p '
+alias nxq='npx -q '
+alias nxnq='npx --no-install -q '
+alias nxqp='npx -q -p '
+alias nxnqp='npx --no-install -q -p '
+alias nxni='npx --no-install --ignore-existing '
+alias nxip='npx --ignore-existing -p '
+alias nxnip='npx --no-install --ignore-existing -p '
+alias nxqi='npx -q --ignore-existing '
+alias nxniq='npx --no-install --ignore-existing -q '
+alias nxiqp='npx --ignore-existing -q -p '
+alias nxniqp='npx --no-install --ignore-existing -q -p '

From a76a9ee437b09b8fe7c47d0288518191ae42952f Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Fri, 14 Feb 2020 14:03:54 -0700
Subject: [PATCH 093/388] Remove fasd zz function from percol plugin

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 plugins/available/percol.plugin.bash | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/plugins/available/percol.plugin.bash b/plugins/available/percol.plugin.bash
index 66610662..c1fc807c 100644
--- a/plugins/available/percol.plugin.bash
+++ b/plugins/available/percol.plugin.bash
@@ -1,5 +1,5 @@
 cite about-plugin
-about-plugin 'Search&Select history and fasd with percol'
+about-plugin 'Search&Select history with percol'
 
 # Notice
 ## You have to upgrade bash to bash 4.x on Mac OS X.
@@ -8,11 +8,9 @@ about-plugin 'Search&Select history and fasd with percol'
 # Install
 ## (sudo) pip install percol
 ## bash-it enable percol
-## optional: bash-it enable fasd
 
 # Usage
 ## C-r to search&select from history
-## zz to search&select from fasd
 
 _replace_by_history() {
     if command -v tac>/dev/null; then
@@ -33,17 +31,5 @@ if command -v percol>/dev/null; then
        echo -e "\033[91m         Your current Bash version is $BASH_VERSION.\033[m"
     else
         bind -x '"\C-r": _replace_by_history'
-
-        # bind zz to percol if fasd enable
-        if [[ $(type -t zz) == 'alias'  ]]; then
-          unalias zz
-        fi
-
-        if command -v fasd>/dev/null; then
-            function zz() {
-                local l=$(fasd -d | awk '{print $2}' | percol)
-                cd $l
-            }
-        fi
     fi
 fi

From 6c01792cbaaeddc6cf99c1f459f6acf0795b5eca Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Fri, 14 Feb 2020 14:30:19 -0700
Subject: [PATCH 094/388] use gocomplete tool for go tool bash completion

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 completion/available/go.completion.bash | 286 +-----------------------
 1 file changed, 9 insertions(+), 277 deletions(-)

diff --git a/completion/available/go.completion.bash b/completion/available/go.completion.bash
index e922cb5e..d3e5147e 100644
--- a/completion/available/go.completion.bash
+++ b/completion/available/go.completion.bash
@@ -1,281 +1,13 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 # bash completion for go tool
-# https://github.com/thomasf/go-bash-completion
+# https://github.com/posener/complete
+# https://pkg.go.dev/github.com/posener/complete?tab=doc
 
-# install in /etc/bash_completion.d/ or your personal directory
+# Install gocomplete:
+# go get -u github.com/posener/complete/gocomplete
+# gocomplete -install
 
-complete -f -X '!*.8' 8l
-complete -f -X '!*.6' 6l
-complete -f -X '!*.5' 5l
-complete -f -X '!*.go' 8g 6g 5g gofmt gccgo
-
-_go_clear_cache() {
-  unset _go_imports
-}
-_go_importpath_cache() {
-   if [ -z "$_go_imports" ]; then
-    _go_imports=$(go list all 2>/dev/null)
-    export _go_imports
-  fi
-}
-
-_go_importpath()
-{
-  echo "$(compgen -W "$_go_imports" -- "$1")"
-}
-
-_go()
-{
-  # TODO: Only allow flags before other arguments. run already does
-  # this.
-
-  local cur=`_get_cword`
-  local prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-  local cmd="${COMP_WORDS[1]}"
-
-  local cmds="build clean doc env fix fmt get
-    install list run test tool version vet"
-  local addhelp="gopath importpath remote
-    testflag testfunc"
-  local other="help"
-  local env_vars="GOARCH GOBIN GOEXE GOHOSTARCH GOHOSTOS GOOS GOPATH GORACE
-    GOROOT GOTOOLDIR GO15VENDOREXPERIMENT CC GOGCCFLAGS CXX CGO_ENABLED"
-
-  if [ "$COMP_CWORD" == 1 ]; then
-    for opt in $cmds; do
-      if [[ "$opt" == "$cmd" ]]; then
-        COMPREPLY=("$opt")
-        return
-      fi
-    done
-  fi
-
-  case "$cmd" in
-    'build')
-      case "$prev" in
-        '-o')
-          _filedir
-          ;;
-        '-p')
-          ;;
-        *)
-          if [[ "$cur" == -* ]]; then
-            COMPREPLY=($(compgen -W "-a -n -o -p -v -x" -- "$cur"))
-          else
-            local found=0
-            for ((i=0; i < ${#COMP_WORDS[@]}; i++)); do
-              case "$i" in
-                0|1|"$COMP_CWORD")
-                  continue
-                  ;;
-              esac
-              local opt="${COMP_WORDS[i]}"
-              if [[ "$opt" != -* ]]; then
-                if [[ "$opt" == *.go && -f "$opt" ]]; then
-                  found=1
-                  break
-                else
-                  found=2
-                  break
-                fi
-              fi
-            done
-            case "$found" in
-              0)
-                _filedir go
-                _go_importpath_cache
-                COMPREPLY+=(`_go_importpath "$cur"`)
-                ;;
-              1)
-                _filedir go
-                ;;
-              2)
-                _go_importpath_cache
-                COMPREPLY=(`_go_importpath "$cur"`)
-                ;;
-            esac
-          fi
-          ;;
-      esac
-      ;;
-    'clean')
-      if [[ "$cur" == -* ]]; then
-        COMPREPLY=($(compgen -W "-i -r -n -x" -- "$cur"))
-      else
-        _go_importpath_cache
-        COMPREPLY=(`_go_importpath "$cur"`)
-      fi
-      ;;
-    'doc')
-      _go_importpath_cache
-      COMPREPLY=(`_go_importpath "$cur"`)
-      ;;
-    'env')
-      COMPREPLY=($(compgen -W "$env_vars" -- "$cur"))
-      ;;
-    'fix')
-      _go_importpath_cache
-      COMPREPLY=(`_go_importpath "$cur"`)
-      ;;
-    'fmt')
-      _go_importpath_cache
-      COMPREPLY=(`_go_importpath "$cur"`)
-      ;;
-    'get')
-      case "$prev" in
-        '-p')
-          ;;
-        *)
-          if [[ "$cur" == -* ]]; then
-            COMPREPLY=($(compgen -W "-a -d -fix -n -p -u -v -x" -- "$cur"))
-          else
-            _go_importpath_cache
-            COMPREPLY=(`_go_importpath "$cur"`)
-          fi
-          ;;
-      esac
-      ;;
-    'install')
-      case "$prev" in
-        '-p')
-          ;;
-        *)
-          if [[ "$cur" == -* ]]; then
-            COMPREPLY=($(compgen -W "-a -n -p -v -x" -- "$cur"))
-          else
-            _go_importpath_cache
-            COMPREPLY=(`_go_importpath "$cur"`)
-          fi
-          ;;
-      esac
-      ;;
-    'list')
-      case "$prev" in
-        '-f')
-          ;;
-        *)
-          if [[ "$cur" == -* ]]; then
-            COMPREPLY=($(compgen -W "-e -f -json" -- "$cur"))
-          else
-            _go_importpath_cache
-            COMPREPLY=(`_go_importpath "$cur"`)
-          fi
-          ;;
-      esac
-      ;;
-    'run')
-      if [[ "$cur" == -* && "$prev" != *.go ]]; then
-        COMPREPLY=($(compgen -W "-a -n -x" -- "$cur"))
-      else
-        _filedir
-      fi
-      ;;
-    'test') # TODO: Support for testflags.
-      case "$prev" in
-        '-file')
-          _filedir go
-          ;;
-        '-p')
-          ;;
-        *)
-          if [[ "$cur" == -* ]]; then
-            COMPREPLY=($(compgen -W "-c -file -i -p -x" -- "$cur"))
-          else
-            _go_importpath_cache
-            COMPREPLY=(`_go_importpath "$cur"`)
-          fi
-          ;;
-        esac
-      ;;
-    'tool')
-      if [ "$COMP_CWORD" == 2 ]; then
-        COMPREPLY=($(compgen -W "$(go tool)" -- "$cur"))
-      else
-        case "${COMP_WORDS[2]}" in
-          [568]a) # TODO: Implement something.
-            #_go_tool_568a
-            ;;
-          [568]c) # TODO: Implement something.
-            #_go_tool_568c
-            ;;
-          [568]g) # TODO: Implement something.
-            #_go_tool_568g
-            ;;
-          [568]l) # TODO: Implement something.
-            #_go_tool_568l
-            ;;
-          'api') # TODO: Implement something.
-            #_go_tool_api
-            ;;
-          'cgo') # TODO: Implement something.
-            #_go_tool_cgo
-            ;;
-          'cov') # TODO: Implement something.
-            #_go_tool_cov
-            ;;
-          'dist') # TODO: Implement something.
-            #_go_tool_dist
-            ;;
-          'ebnflint') # TODO: Implement something.
-            #_go_tool_ebnflint
-            ;;
-          'fix') # TODO: Implement something.
-            #_go_tool_fix
-            ;;
-          'gotype') # TODO: Implement something.
-            #_go_tool_gotype
-            ;;
-          'nm') # TODO: Implement something.
-            #_go_tool_nm
-            ;;
-          'pack') # TODO: Implement something.
-            #_go_tool_pack
-            ;;
-          'pprof') # TODO: Implement something.
-            #_go_tool_pprof
-            ;;
-          'prof') # TODO: Implement something.
-            #_go_tool_prof
-            ;;
-          'vet') # TODO: Implement something.
-            #_go_tool_vet
-            ;;
-          'yacc') # TODO: Implement something.
-            #_go_tool_yacc
-            ;;
-        esac
-        if [[ "$cur" == -* ]]; then
-          COMPREPLY=($(compgen -W "${COMPREPLY[*]} -h" -- "$cur"))
-        fi
-      fi
-      ;;
-    'version')
-      ;;
-    'vet')
-      if [[ "$cur" == -* ]]; then
-        :
-      else
-        _go_importpath_cache
-        COMPREPLY=(`_go_importpath "$cur"`)
-      fi
-      ;;
-    'help')
-      if [ "$COMP_CWORD" == 2 ]; then
-        COMPREPLY=($(compgen -W "$cmds $addhelp" -- "$cur"))
-      fi
-      ;;
-    *)
-      if [ "$COMP_CWORD" == 1 ]; then
-        COMPREPLY=($(compgen -W "$cmds $other" -- "$cur"))
-      else
-        _filedir
-      fi
-      ;;
-  esac
-}
-
-complete $filenames -F _go go
-
-# vim:ts=2 sw=2 et syn=sh
+if _command_exists gocomplete && _command_exists go ; then
+  complete -C ${GOBIN}/gocomplete go
+fi

From afae3f8d251d8fb923f61833e47e48c28d7f613e Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Fri, 14 Feb 2020 14:36:03 -0700
Subject: [PATCH 095/388] Shellcheck double quote env variable

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 completion/available/go.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/go.completion.bash b/completion/available/go.completion.bash
index d3e5147e..73360ce2 100644
--- a/completion/available/go.completion.bash
+++ b/completion/available/go.completion.bash
@@ -9,5 +9,5 @@
 # gocomplete -install
 
 if _command_exists gocomplete && _command_exists go ; then
-  complete -C ${GOBIN}/gocomplete go
+  complete -C "${GOBIN}"/gocomplete go
 fi

From 0a0e2ff2850b90ed54dab5e4b31c703580560287 Mon Sep 17 00:00:00 2001
From: John McBride <jpmmcbride@gmail.com>
Date: Fri, 14 Feb 2020 17:40:14 -0700
Subject: [PATCH 096/388] Revert to using env for invoking bash

Signed-off-by: John McBride <jpmmcbride@gmail.com>
---
 completion/available/go.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/go.completion.bash b/completion/available/go.completion.bash
index 73360ce2..dcc5cb98 100644
--- a/completion/available/go.completion.bash
+++ b/completion/available/go.completion.bash
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 
 # bash completion for go tool
 # https://github.com/posener/complete

From 72224ab03469bbb7705e39ace9c7f9cb26faeccc Mon Sep 17 00:00:00 2001
From: Bingzhang Dai <bingzhangdai@users.noreply.github.com>
Date: Sun, 16 Feb 2020 15:39:37 +0800
Subject: [PATCH 097/388] Create ~/.ssh and ~/.ssh/config if does not exits

---
 plugins/available/ssh.plugin.bash | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/available/ssh.plugin.bash b/plugins/available/ssh.plugin.bash
index 51587b29..bda4601e 100644
--- a/plugins/available/ssh.plugin.bash
+++ b/plugins/available/ssh.plugin.bash
@@ -7,14 +7,15 @@ function add_ssh() {
   param '2: hostname'
   param '3: user'
   group 'ssh'
-
+  [[ $# -ne 3 ]] && echo "add_ssh host hostname user" && return 1
+  [[ ! -d ~/.ssh ]] && mkdir -m 700 ~/.ssh
+  [[ ! -e ~/.ssh/config ]] && touch ~/.ssh/config && chmod 600 ~/.ssh/config
   echo -en "\n\nHost $1\n  HostName $2\n  User $3\n  ServerAliveInterval 30\n  ServerAliveCountMax 120" >> ~/.ssh/config
 }
 
 function sshlist() {
   about 'list hosts defined in ssh config'
   group 'ssh'
-
   awk '$1 ~ /Host$/ {for (i=2; i<=NF; i++) print $i}' ~/.ssh/config
 }
 

From bf7da247bf4570443a586c3e411500cd14ef6025 Mon Sep 17 00:00:00 2001
From: Bingzhang Dai <bingzhangdai@users.noreply.github.com>
Date: Sun, 16 Feb 2020 15:42:51 +0800
Subject: [PATCH 098/388] Revert changes

---
 plugins/available/ssh.plugin.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/available/ssh.plugin.bash b/plugins/available/ssh.plugin.bash
index bda4601e..dd023ad2 100644
--- a/plugins/available/ssh.plugin.bash
+++ b/plugins/available/ssh.plugin.bash
@@ -7,6 +7,7 @@ function add_ssh() {
   param '2: hostname'
   param '3: user'
   group 'ssh'
+
   [[ $# -ne 3 ]] && echo "add_ssh host hostname user" && return 1
   [[ ! -d ~/.ssh ]] && mkdir -m 700 ~/.ssh
   [[ ! -e ~/.ssh/config ]] && touch ~/.ssh/config && chmod 600 ~/.ssh/config
@@ -15,7 +16,8 @@ function add_ssh() {
 
 function sshlist() {
   about 'list hosts defined in ssh config'
-  group 'ssh'
+  group 'ssh
+
   awk '$1 ~ /Host$/ {for (i=2; i<=NF; i++) print $i}' ~/.ssh/config
 }
 

From f7cb2ef5c6275f9cc02cf28f6cde0a4e327eb123 Mon Sep 17 00:00:00 2001
From: Bingzhang Dai <bingzhangdai@users.noreply.github.com>
Date: Sun, 16 Feb 2020 15:44:50 +0800
Subject: [PATCH 099/388] Update ssh.plugin.bash

---
 plugins/available/ssh.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/ssh.plugin.bash b/plugins/available/ssh.plugin.bash
index dd023ad2..6e082881 100644
--- a/plugins/available/ssh.plugin.bash
+++ b/plugins/available/ssh.plugin.bash
@@ -16,7 +16,7 @@ function add_ssh() {
 
 function sshlist() {
   about 'list hosts defined in ssh config'
-  group 'ssh
+  group 'ssh'
 
   awk '$1 ~ /Host$/ {for (i=2; i<=NF; i++) print $i}' ~/.ssh/config
 }

From 54673712be7cc25f64b25bf2672477d5218ddd2f Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Thu, 13 Feb 2020 16:49:43 +0100
Subject: [PATCH 100/388] Updated init code for fuck

Moved to a plugin, removed "fuck" alias.
---
 aliases/available/fuck.aliases.bash | 1 -
 plugins/available/fuck.plugin.bash  | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 plugins/available/fuck.plugin.bash

diff --git a/aliases/available/fuck.aliases.bash b/aliases/available/fuck.aliases.bash
index 54648931..16511c36 100644
--- a/aliases/available/fuck.aliases.bash
+++ b/aliases/available/fuck.aliases.bash
@@ -1,3 +1,2 @@
 # https://github.com/nvbn/thefuck
-alias fuck='eval $(thefuck $(fc -ln -1))'
 alias please='fuck'
diff --git a/plugins/available/fuck.plugin.bash b/plugins/available/fuck.plugin.bash
new file mode 100644
index 00000000..242a77df
--- /dev/null
+++ b/plugins/available/fuck.plugin.bash
@@ -0,0 +1,9 @@
+cite about-plugin
+about-plugin 'Initialization for fuck'
+
+# https://github.com/nvbn/thefuck
+
+if _command_exists thefuck; then
+  # shellcheck disable=SC2046
+  eval $(thefuck --alias)
+fi

From 48383afc49632bd84b8ffd0fcf0f69078b0a4945 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Sun, 16 Feb 2020 12:35:52 +0100
Subject: [PATCH 101/388] Renamed the fuck plugin

---
 plugins/available/{fuck.plugin.bash => thefuck.plugin.bash} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/available/{fuck.plugin.bash => thefuck.plugin.bash} (100%)

diff --git a/plugins/available/fuck.plugin.bash b/plugins/available/thefuck.plugin.bash
similarity index 100%
rename from plugins/available/fuck.plugin.bash
rename to plugins/available/thefuck.plugin.bash

From ebb1e1fc17c60aeb20ff6b42ab4d882687325e4e Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Sun, 16 Feb 2020 12:36:43 +0100
Subject: [PATCH 102/388] Renamed fuck alias file

---
 aliases/available/{fuck.aliases.bash => thefuck.aliases.bash} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename aliases/available/{fuck.aliases.bash => thefuck.aliases.bash} (100%)

diff --git a/aliases/available/fuck.aliases.bash b/aliases/available/thefuck.aliases.bash
similarity index 100%
rename from aliases/available/fuck.aliases.bash
rename to aliases/available/thefuck.aliases.bash

From 4933f180f3a52d6e308d4e1e71990e5739591d43 Mon Sep 17 00:00:00 2001
From: LeoWW <LeoWW@users.noreply.github.com>
Date: Mon, 17 Feb 2020 12:56:12 -0800
Subject: [PATCH 103/388] add gprom and gpunch

---
 aliases/available/git.aliases.bash | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 9a65b22a..e784dade 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -77,6 +77,9 @@ alias gpatch="git format-patch -1"
 alias gnew="git log HEAD@{1}..HEAD@{0}"
 # Add uncommitted and unstaged changes to the last commit
 alias gcaa="git commit -a --amend -C HEAD"
+# Rebase with latest remote master
+alias gprom="git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master"
+alias gpunch="git push --force-with-lease"
 alias ggui="git gui"
 alias gcsam="git commit -S -am"
 alias gst="git stash"

From b70c02c4aed66aa2320fa52075639b2244842ddc Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Fri, 21 Feb 2020 12:16:57 -0600
Subject: [PATCH 104/388] enhance makefile completion to support multiple files
 and gnumake

---
 completion/available/makefile.completion.bash | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/completion/available/makefile.completion.bash b/completion/available/makefile.completion.bash
index c2a833ac..9f70958a 100644
--- a/completion/available/makefile.completion.bash
+++ b/completion/available/makefile.completion.bash
@@ -1,3 +1,24 @@
-# Add completion for Makefile
-# see http://stackoverflow.com/a/38415982/1472048
-complete -W "\`grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' Makefile | sed 's/[^a-zA-Z0-9_-]*$//'\`" make
+#!/usr/bin/env bash
+# Bash completion for Makefile
+
+# Loosely adapted from http://stackoverflow.com/a/38415982/1472048
+
+_makecomplete() {
+  # https://www.gnu.org/software/make/manual/html_node/Makefile-Names.html
+  local files=( $(find . -maxdepth 1 -regextype posix-extended -regex '.*(GNU)?[Mm]akefile$' -printf '%f ') )
+
+  # collect all targets
+  local targets=''
+  for f in ${files[@]} ; do
+    for t in $(grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' $f | cut -d':' -f1) ; do
+      targets+="$t\n"
+    done
+  done
+
+  # flatten the array for completion
+  COMPREPLY=($(compgen -W "$(echo -e "$targets" | head -c -1 | sort -u)" -- ${COMP_WORDS[COMP_CWORD]}))
+  return 0
+}
+
+complete -o nospace -F _makecomplete make
+complete -o nospace -F _makecomplete gnumake

From 9d97532f8ee6a60f8ff7cc0db65c4fcabc047bb8 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Fri, 21 Feb 2020 12:56:00 -0600
Subject: [PATCH 105/388] enhance makefile completion and make shellcheck happy

---
 completion/available/makefile.completion.bash | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/completion/available/makefile.completion.bash b/completion/available/makefile.completion.bash
index 9f70958a..d53e18fb 100644
--- a/completion/available/makefile.completion.bash
+++ b/completion/available/makefile.completion.bash
@@ -5,18 +5,24 @@
 
 _makecomplete() {
   # https://www.gnu.org/software/make/manual/html_node/Makefile-Names.html
-  local files=( $(find . -maxdepth 1 -regextype posix-extended -regex '.*(GNU)?[Mm]akefile$' -printf '%f ') )
+  local files=()
+  while IFS='' read -r line; do
+    files+=("$line")
+  done < <(find . -maxdepth 1 -regextype posix-extended -regex '.*(GNU)?[Mm]akefile$' -printf '%f\n')
 
   # collect all targets
-  local targets=''
-  for f in ${files[@]} ; do
-    for t in $(grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' $f | cut -d':' -f1) ; do
-      targets+="$t\n"
-    done
+  local targets=()
+  for f in "${files[@]}" ; do
+    while IFS='' read -r line ; do
+      targets+=("$line")
+    done < <(grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' "$f" | cut -d':' -f1)
   done
 
   # flatten the array for completion
-  COMPREPLY=($(compgen -W "$(echo -e "$targets" | head -c -1 | sort -u)" -- ${COMP_WORDS[COMP_CWORD]}))
+  COMPREPLY=()
+  while IFS='' read -r line ; do
+    COMPREPLY+=("$line")
+  done < <(compgen -W "$(tr ' ' '\n' <<<"${targets[@]}" | sort -u)" -- "${COMP_WORDS[COMP_CWORD]}")
   return 0
 }
 

From 552cd89851a331811fcf40888b22b63960215703 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Fri, 21 Feb 2020 13:09:08 -0600
Subject: [PATCH 106/388] enhance makefile completion - shortcircuit early when
 nothing is found

---
 completion/available/makefile.completion.bash | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/completion/available/makefile.completion.bash b/completion/available/makefile.completion.bash
index d53e18fb..021dd484 100644
--- a/completion/available/makefile.completion.bash
+++ b/completion/available/makefile.completion.bash
@@ -4,12 +4,16 @@
 # Loosely adapted from http://stackoverflow.com/a/38415982/1472048
 
 _makecomplete() {
+  COMPREPLY=()
+
   # https://www.gnu.org/software/make/manual/html_node/Makefile-Names.html
   local files=()
   while IFS='' read -r line; do
     files+=("$line")
   done < <(find . -maxdepth 1 -regextype posix-extended -regex '.*(GNU)?[Mm]akefile$' -printf '%f\n')
 
+  [ "${#files[@]}" -eq 0 ] && return 0
+
   # collect all targets
   local targets=()
   for f in "${files[@]}" ; do
@@ -18,11 +22,13 @@ _makecomplete() {
     done < <(grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' "$f" | cut -d':' -f1)
   done
 
-  # flatten the array for completion
-  COMPREPLY=()
+  [ "${#targets[@]}" -eq 0 ] && return 0
+
+  # use the targets for completion
   while IFS='' read -r line ; do
     COMPREPLY+=("$line")
   done < <(compgen -W "$(tr ' ' '\n' <<<"${targets[@]}" | sort -u)" -- "${COMP_WORDS[COMP_CWORD]}")
+
   return 0
 }
 

From 239f7086379ddbe6274ff0f9fce1d53cd4806f13 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Fri, 21 Feb 2020 22:27:56 -0600
Subject: [PATCH 107/388] enhance makefile completion - remove use of find

---
 completion/available/makefile.completion.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/completion/available/makefile.completion.bash b/completion/available/makefile.completion.bash
index 021dd484..4bc51639 100644
--- a/completion/available/makefile.completion.bash
+++ b/completion/available/makefile.completion.bash
@@ -8,9 +8,9 @@ _makecomplete() {
 
   # https://www.gnu.org/software/make/manual/html_node/Makefile-Names.html
   local files=()
-  while IFS='' read -r line; do
-    files+=("$line")
-  done < <(find . -maxdepth 1 -regextype posix-extended -regex '.*(GNU)?[Mm]akefile$' -printf '%f\n')
+  for f in 'GNUmakefile' 'makefile' 'Makefile' ; do
+    [ -f "$f" ] && files+=("$f")
+  done
 
   [ "${#files[@]}" -eq 0 ] && return 0
 

From 2e4c4ad29aa56679b4fabaa890dc3fc4e9e08b01 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Fri, 21 Feb 2020 22:29:14 -0600
Subject: [PATCH 108/388] enhance makefile completion - remove hash bang

---
 completion/available/makefile.completion.bash | 2 --
 1 file changed, 2 deletions(-)

diff --git a/completion/available/makefile.completion.bash b/completion/available/makefile.completion.bash
index 4bc51639..e72ba6fd 100644
--- a/completion/available/makefile.completion.bash
+++ b/completion/available/makefile.completion.bash
@@ -1,6 +1,4 @@
-#!/usr/bin/env bash
 # Bash completion for Makefile
-
 # Loosely adapted from http://stackoverflow.com/a/38415982/1472048
 
 _makecomplete() {

From fe26adf7ac6dea66935dd5a93c41c1691cb90648 Mon Sep 17 00:00:00 2001
From: Taro Sato <okomestudio@gmail.com>
Date: Sat, 22 Feb 2020 16:20:40 -0800
Subject: [PATCH 109/388] Pass the aliased command as an argument to
 _filedir_xspec

---
 plugins/available/alias-completion.plugin.bash | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/available/alias-completion.plugin.bash b/plugins/available/alias-completion.plugin.bash
index e1c4ade7..92f06d71 100644
--- a/plugins/available/alias-completion.plugin.bash
+++ b/plugins/available/alias-completion.plugin.bash
@@ -63,6 +63,9 @@ function alias_completion {
             local compl_func="${new_completion/#* -F /}"; compl_func="${compl_func%% *}"
             # avoid recursive call loops by ignoring our own functions
             if [[ "${compl_func#_$namespace::}" == $compl_func ]]; then
+                if [[ $compl_func == _filedir_xspec ]]; then
+                    compl_func_args=$alias_cmd
+                fi
                 local compl_wrapper="_${namespace}::${alias_name}"
                     echo "function $compl_wrapper {
                         (( COMP_CWORD += ${#alias_arg_words[@]} ))
@@ -70,7 +73,7 @@ function alias_completion {
                         (( COMP_POINT -= \${#COMP_LINE} ))
                         COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args}
                         (( COMP_POINT += \${#COMP_LINE} ))
-                        $compl_func
+                        $compl_func $compl_func_args
                     }" >> "$tmp_file"
                     new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }"
             fi

From fbc8f7ddf4bb702df74bdd13155801f859bca70f Mon Sep 17 00:00:00 2001
From: Taro Sato <okomestudio@gmail.com>
Date: Sun, 23 Feb 2020 18:38:06 -0800
Subject: [PATCH 110/388] Add comment explaining compl_func_args

---
 plugins/available/alias-completion.plugin.bash | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/available/alias-completion.plugin.bash b/plugins/available/alias-completion.plugin.bash
index 92f06d71..b0131001 100644
--- a/plugins/available/alias-completion.plugin.bash
+++ b/plugins/available/alias-completion.plugin.bash
@@ -63,9 +63,13 @@ function alias_completion {
             local compl_func="${new_completion/#* -F /}"; compl_func="${compl_func%% *}"
             # avoid recursive call loops by ignoring our own functions
             if [[ "${compl_func#_$namespace::}" == $compl_func ]]; then
+                # the completion function stored in compl_func may need argument(s),
+                # in which case they should be provided in compl_func_args (see #1497)
+                local compl_func_args=
                 if [[ $compl_func == _filedir_xspec ]]; then
                     compl_func_args=$alias_cmd
                 fi
+
                 local compl_wrapper="_${namespace}::${alias_name}"
                     echo "function $compl_wrapper {
                         (( COMP_CWORD += ${#alias_arg_words[@]} ))

From 63d5a73918334d950393728dca291580f77254a7 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Mon, 24 Feb 2020 15:49:53 -0600
Subject: [PATCH 111/388] mv to uuid.aliases.bash

---
 aliases/available/general.aliases.bash | 5 -----
 aliases/available/uuid.aliases.bash    | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 aliases/available/uuid.aliases.bash

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 9957befc..542b76cd 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -113,8 +113,3 @@ catt() {
     fi
   done
 }
-
-# uuidgen
-alias uuidu="uuidgen"
-alias uuidl="uuidgen | tr '[:upper:]' '[:lower:]'"
-alias uuid=uuidl # because upper case is like YELLING
diff --git a/aliases/available/uuid.aliases.bash b/aliases/available/uuid.aliases.bash
new file mode 100644
index 00000000..81f317c9
--- /dev/null
+++ b/aliases/available/uuid.aliases.bash
@@ -0,0 +1,4 @@
+# uuidgen
+alias uuidu="uuidgen"
+alias uuidl="uuidgen | tr '[:upper:]' '[:lower:]'"
+alias uuid=uuidl # because upper case is like YELLING

From 59854e5fb1d7365848d3d75cd6fa29bc7bbc66b2 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Wed, 26 Feb 2020 09:23:19 -0600
Subject: [PATCH 112/388] uuid.aliases.bash -> uuidgen.aliases.bash because the
 command name is uuidgen & add cite + about-alias

---
 aliases/available/{uuid.aliases.bash => uuidgen.aliases.bash} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename aliases/available/{uuid.aliases.bash => uuidgen.aliases.bash} (72%)

diff --git a/aliases/available/uuid.aliases.bash b/aliases/available/uuidgen.aliases.bash
similarity index 72%
rename from aliases/available/uuid.aliases.bash
rename to aliases/available/uuidgen.aliases.bash
index 81f317c9..fec5a2b8 100644
--- a/aliases/available/uuid.aliases.bash
+++ b/aliases/available/uuidgen.aliases.bash
@@ -1,4 +1,6 @@
-# uuidgen
+cite 'uuid-alias'
+about-alias 'uuidgen aliases'
+
 alias uuidu="uuidgen"
 alias uuidl="uuidgen | tr '[:upper:]' '[:lower:]'"
 alias uuid=uuidl # because upper case is like YELLING

From 8fc6f82455c980af0a1181e7015b12ef79330f93 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 26 Feb 2020 10:25:12 -0800
Subject: [PATCH 113/388] Renames thefuck alias file to fuck

---
 aliases/available/{thefuck.aliases.bash => fuck.aliases.bash} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename aliases/available/{thefuck.aliases.bash => fuck.aliases.bash} (100%)

diff --git a/aliases/available/thefuck.aliases.bash b/aliases/available/fuck.aliases.bash
similarity index 100%
rename from aliases/available/thefuck.aliases.bash
rename to aliases/available/fuck.aliases.bash

From d6425922a105586e0587bf69725056c09277a3da Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 26 Feb 2020 10:28:10 -0800
Subject: [PATCH 114/388] Add fuck/please aliases, playing nicely with thefuck
 plugin

---
 aliases/available/fuck.aliases.bash | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/aliases/available/fuck.aliases.bash b/aliases/available/fuck.aliases.bash
index 16511c36..959807fb 100644
--- a/aliases/available/fuck.aliases.bash
+++ b/aliases/available/fuck.aliases.bash
@@ -1,2 +1,11 @@
-# https://github.com/nvbn/thefuck
-alias please='fuck'
+cite 'about-alias'
+about-alias 'fuck/please to retry last command with sudo'
+
+# Play nicely with 'thefuck' plugin
+if ! _command_exists fuck ; then
+    alias fuck='sudo $(fc -ln -1)'
+fi
+alias please=fuck
+alias plz=please
+alias fucking=sudo
+

From 78397ad598673fe09036c3002d55c0b45dfa90e7 Mon Sep 17 00:00:00 2001
From: Ofir Shtrull <ofirs@tikalk.com>
Date: Thu, 27 Feb 2020 14:40:57 +0200
Subject: [PATCH 115/388] Add terraform workspace to prompt

---
 themes/powerline-multiline/README.md                     | 2 ++
 .../powerline-multiline/powerline-multiline.theme.bash   | 3 +++
 themes/powerline-naked/README.md                         | 1 +
 themes/powerline-naked/powerline-naked.theme.bash        | 3 +++
 themes/powerline-plain/README.md                         | 1 +
 themes/powerline-plain/powerline-plain.theme.bash        | 3 +++
 themes/powerline/README.md                               | 1 +
 themes/powerline/powerline.base.bash                     | 9 +++++++++
 themes/powerline/powerline.theme.bash                    | 3 +++
 9 files changed, 26 insertions(+)

diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index cbc585e2..3debf1d3 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -66,6 +66,8 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `ruby` - Current ruby version if using `rvm`
 * `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git` 
+* `terraform` - Current terraform workspace
+* `k8s_context` - Show current kubernetes context
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index f76c5969..54651cb6 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -49,6 +49,9 @@ RBENV_THEME_PROMPT_SUFFIX=""
 RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
 
+TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
+TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
+
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index 296c30ab..ec3b8fac 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -60,6 +60,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `ruby` - Current ruby version if using `rvm`
 * `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git`
+* `terraform` - Current terraform workspace
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index dfa3eb1d..bf314aca 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -47,6 +47,9 @@ RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
+TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
+TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 2470a718..7ccb1eeb 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -52,6 +52,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `hostname` - Host name of machine
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
+* `terraform` - Current terraform workspace
 * `last_status` - Exit status of last run command
 * `python_venv` - Python virtual environment information (`virtualenv`, `venv`
   and `conda` supported)
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 3ead67fe..0a353ca5 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -43,6 +43,9 @@ RUBY_CHAR=${POWERLINE_RUBY_CHAR:="💎 "}
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 
+TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
+TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 2076336f..5f0d69dd 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -67,6 +67,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git`
 * `user_info` - Current user
+* `terraform` - Current terraform workspace
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index c3fac913..26fb0d3f 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -41,6 +41,15 @@ function __powerline_user_info_prompt {
   [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
 }
 
+function __powerline_terraform_prompt() {
+  local terraform_workspace=""
+
+  if [ -d .terraform ]; then
+    terraform_workspace="$(command terraform workspace show 2>/dev/null)"
+    [[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR}"
+  fi
+}
+
 function __powerline_node_prompt {
   local node_version=""
 
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index f3ef9a32..d897c7c8 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -45,6 +45,9 @@ RBENV_THEME_PROMPT_SUFFIX=""
 RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
 
+TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
+TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
+
 KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
 KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
 

From 936a79f6190e1d620d843b566d035d627c92b189 Mon Sep 17 00:00:00 2001
From: Ofir Shtrull <ofirs@tikalk.com>
Date: Thu, 27 Feb 2020 20:53:35 +0200
Subject: [PATCH 116/388] now usable by all prompts

---
 themes/base.theme.bash                            | 8 ++++++++
 themes/powerline-multiline/README.md              | 2 +-
 themes/powerline-naked/powerline-naked.base.bash  | 9 +++++----
 themes/powerline-naked/powerline-naked.theme.bash | 3 +++
 themes/powerline-plain/README.md                  | 2 +-
 themes/powerline/README.md                        | 2 +-
 themes/powerline/powerline.base.bash              | 9 +++++++++
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index d193191e..d5858018 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -155,6 +155,14 @@ function scm_prompt_info_common {
   { [[ ${SCM} == ${SCM_SVN} ]] && svn_prompt_info && return; } || true
 }
 
+function terraform_workspace_prompt {
+    if _command_exists terraform ; then
+        if [ -d .terraform ]; then
+            echo -e "$(terraform workspace show 2>/dev/null)"
+        fi
+    fi
+}
+
 function git_prompt_minimal_info {
   SCM_STATE=${SCM_THEME_PROMPT_CLEAN}
 
diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index 3debf1d3..f4a1fab8 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -60,6 +60,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
 * `in_vim` - Show identifier if running in `:terminal` from vim
+* `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
 * `python_venv` - Python virtual environment information (`virtualenv`, `venv`
   and `conda` supported)
@@ -67,7 +68,6 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git` 
 * `terraform` - Current terraform workspace
-* `k8s_context` - Show current kubernetes context
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash
index 16b633be..d4a2e648 100644
--- a/themes/powerline-naked/powerline-naked.base.bash
+++ b/themes/powerline-naked/powerline-naked.base.bash
@@ -1,7 +1,8 @@
 . "$BASH_IT/themes/powerline/powerline.base.bash"
 
-function __powerline_left_segment {
-  local OLD_IFS="${IFS}"; IFS="|"
+function __powerline_left_segment() {
+  local OLD_IFS="${IFS}"
+  IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
   local separator=""
@@ -25,9 +26,9 @@ function __powerline_left_segment {
 
   LEFT_PROMPT+="$(set_color ${params[1]} -)${pad_before_segment}${params[0]}${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
-  (( SEGMENTS_AT_LEFT += 1 ))
+  ((SEGMENTS_AT_LEFT += 1))
 }
 
-function __powerline_left_last_segment_padding {
+function __powerline_left_last_segment_padding() {
   LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -) ${normal}"
 }
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index bf314aca..93127c44 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -17,6 +17,9 @@ USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=240}
 USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
 
+TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
+TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
+
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
 PYTHON_VENV_THEME_PROMPT_COLOR=${POWERLINE_PYTHON_VENV_COLOR:=35}
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 7ccb1eeb..049c12f1 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -52,13 +52,13 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `hostname` - Host name of machine
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
-* `terraform` - Current terraform workspace
 * `last_status` - Exit status of last run command
 * `python_venv` - Python virtual environment information (`virtualenv`, `venv`
   and `conda` supported)
 * `ruby` - Current ruby version if using `rvm`
 * `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git`
+* `terraform` - Current terraform workspace
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 5f0d69dd..587e0788 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -66,8 +66,8 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `ruby` - Current ruby version if using `rvm`
 * `node` - Current node version (only `nvm` is supported)
 * `scm` - Version control information, `git`
-* `user_info` - Current user
 * `terraform` - Current terraform workspace
+* `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
   hierarchy, only the directory you're currently in.
 * `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 26fb0d3f..f9a6d0d5 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -50,6 +50,15 @@ function __powerline_terraform_prompt() {
   fi
 }
 
+function __powerline_terraform_prompt() {
+  local terraform_workspace=""
+
+  if [ -d .terraform ]; then
+    terraform_workspace="$(terraform_workspace_prompt)"
+    [[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR}"
+  fi
+}
+
 function __powerline_node_prompt {
   local node_version=""
 

From 84ad65c309d6df159454d2041b0822e177370928 Mon Sep 17 00:00:00 2001
From: Ofir Shtrull <ofirs@tikalk.com>
Date: Thu, 27 Feb 2020 21:52:21 +0200
Subject: [PATCH 117/388] cleanup

---
 themes/powerline-naked/powerline-naked.base.bash |  2 +-
 themes/powerline/powerline.base.bash             | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash
index d4a2e648..a4283b75 100644
--- a/themes/powerline-naked/powerline-naked.base.bash
+++ b/themes/powerline-naked/powerline-naked.base.bash
@@ -29,6 +29,6 @@ function __powerline_left_segment() {
   ((SEGMENTS_AT_LEFT += 1))
 }
 
-function __powerline_left_last_segment_padding() {
+function __powerline_left_last_segment_padding {
   LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -) ${normal}"
 }
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index f9a6d0d5..969b210d 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -41,16 +41,7 @@ function __powerline_user_info_prompt {
   [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
 }
 
-function __powerline_terraform_prompt() {
-  local terraform_workspace=""
-
-  if [ -d .terraform ]; then
-    terraform_workspace="$(command terraform workspace show 2>/dev/null)"
-    [[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR}"
-  fi
-}
-
-function __powerline_terraform_prompt() {
+function __powerline_terraform_prompt {
   local terraform_workspace=""
 
   if [ -d .terraform ]; then

From a578fa81e424844aac8bfc19fcc4b404c94a78e2 Mon Sep 17 00:00:00 2001
From: Ofir Shtrull <ofirs@tikalk.com>
Date: Thu, 27 Feb 2020 22:10:38 +0200
Subject: [PATCH 118/388] more cleanup

---
 themes/powerline-naked/powerline-naked.base.bash | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash
index a4283b75..16b633be 100644
--- a/themes/powerline-naked/powerline-naked.base.bash
+++ b/themes/powerline-naked/powerline-naked.base.bash
@@ -1,8 +1,7 @@
 . "$BASH_IT/themes/powerline/powerline.base.bash"
 
-function __powerline_left_segment() {
-  local OLD_IFS="${IFS}"
-  IFS="|"
+function __powerline_left_segment {
+  local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
   local separator=""
@@ -26,7 +25,7 @@ function __powerline_left_segment() {
 
   LEFT_PROMPT+="$(set_color ${params[1]} -)${pad_before_segment}${params[0]}${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
-  ((SEGMENTS_AT_LEFT += 1))
+  (( SEGMENTS_AT_LEFT += 1 ))
 }
 
 function __powerline_left_last_segment_padding {

From 381a0069c34700986dbfd017191dd68a96d70929 Mon Sep 17 00:00:00 2001
From: Ofir Shtrull <ofirs@tikalk.com>
Date: Thu, 27 Feb 2020 23:32:43 +0200
Subject: [PATCH 119/388] changed order of params

---
 themes/powerline-naked/powerline-naked.theme.bash | 9 +++------
 themes/powerline-plain/powerline-plain.theme.bash | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 93127c44..5c5fed26 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -17,9 +17,6 @@ USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=240}
 USER_INFO_THEME_PROMPT_COLOR_SUDO=${POWERLINE_USER_INFO_COLOR_SUDO:=202}
 
-TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
-TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
-
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
 PYTHON_VENV_THEME_PROMPT_COLOR=${POWERLINE_PYTHON_VENV_COLOR:=35}
@@ -47,12 +44,12 @@ RBENV_THEME_PROMPT_SUFFIX=""
 RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
 
-KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
-KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
-
 TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
 TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
 
+KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
+KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 0a353ca5..942c411c 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -40,12 +40,12 @@ RBENV_THEME_PROMPT_SUFFIX=""
 RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
 RUBY_CHAR=${POWERLINE_RUBY_CHAR:="💎 "}
 
-KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
-KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
-
 TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}
 TERRAFORM_CHAR=${POWERLINE_TERRAFORM_CHAR:="❲t❳ "}
 
+KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
+KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=${POWERLINE_KUBERNETES_CONTEXT_COLOR:=26}
+
 AWS_PROFILE_CHAR=${POWERLINE_AWS_PROFILE_CHAR:="❲aws❳ "}
 AWS_PROFILE_PROMPT_COLOR=${POWERLINE_AWS_PROFILE_COLOR:=208}
 

From a7a777b20ad014240ff7a2670ac36d3f09800656 Mon Sep 17 00:00:00 2001
From: Taro Sato <okomestudio@gmail.com>
Date: Thu, 27 Feb 2020 19:30:49 -0800
Subject: [PATCH 120/388] Pass all the expected arguments to completion
 function

---
 plugins/available/alias-completion.plugin.bash | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/available/alias-completion.plugin.bash b/plugins/available/alias-completion.plugin.bash
index b0131001..349877e6 100644
--- a/plugins/available/alias-completion.plugin.bash
+++ b/plugins/available/alias-completion.plugin.bash
@@ -63,21 +63,23 @@ function alias_completion {
             local compl_func="${new_completion/#* -F /}"; compl_func="${compl_func%% *}"
             # avoid recursive call loops by ignoring our own functions
             if [[ "${compl_func#_$namespace::}" == $compl_func ]]; then
-                # the completion function stored in compl_func may need argument(s),
-                # in which case they should be provided in compl_func_args (see #1497)
-                local compl_func_args=
-                if [[ $compl_func == _filedir_xspec ]]; then
-                    compl_func_args=$alias_cmd
-                fi
-
                 local compl_wrapper="_${namespace}::${alias_name}"
                     echo "function $compl_wrapper {
+                        local compl_word=\$2
+                        local prec_word=\$3
+                        # check if prec_word is the alias itself. if so, replace it
+                        # with the last word in the unaliased form, i.e.,
+                        # alias_cmd + ' ' + alias_args.
+                        if [[ \$COMP_LINE == \"\$prec_word \$compl_word\" ]]; then
+                            prec_word=\"$alias_cmd $alias_args\"
+                            prec_word=\${prec_word#* }
+                        fi
                         (( COMP_CWORD += ${#alias_arg_words[@]} ))
                         COMP_WORDS=($alias_cmd $alias_args \${COMP_WORDS[@]:1})
                         (( COMP_POINT -= \${#COMP_LINE} ))
                         COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args}
                         (( COMP_POINT += \${#COMP_LINE} ))
-                        $compl_func $compl_func_args
+                        $compl_func \"$alias_cmd\" \"\$compl_word\" \"\$prec_word\"
                     }" >> "$tmp_file"
                     new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }"
             fi

From 4c23c1c90befdcdd30b283cea5741d117aac2268 Mon Sep 17 00:00:00 2001
From: Radoslaw Smigielski <radoslaw.smigielski@interia.pl>
Date: Tue, 3 Mar 2020 06:39:41 +0000
Subject: [PATCH 121/388] Update theme name

---
 themes/radek/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/radek/README.md b/themes/radek/README.md
index 2dfff808..7dc521a2 100644
--- a/themes/radek/README.md
+++ b/themes/radek/README.md
@@ -1,4 +1,4 @@
-# Powerline Theme
+# Radek Theme
 
 A colorful theme for Python developers.
 It does not have any requirments.

From d4c2f8b73f1ee5fd6d483b9a73981dd982945b3b Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sun, 8 Mar 2020 23:53:27 -0500
Subject: [PATCH 122/388] nit pick cleanup

---
 lib/utilities.bash | 90 +++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/lib/utilities.bash b/lib/utilities.bash
index dbefbc27..7994a731 100644
--- a/lib/utilities.bash
+++ b/lib/utilities.bash
@@ -2,6 +2,51 @@
 #
 # A collection of reusable functions.
 
+###########################################################################
+# Generic utilies
+###########################################################################
+
+# This function searches an array for an exact match against the term passed
+# as the first argument to the function. This function exits as soon as
+# a match is found.
+#
+# Returns:
+#   0 when a match is found, otherwise 1.
+#
+# Examples:
+#   $ declare -a fruits=(apple orange pear mandarin)
+#
+#   $ _bash-it-array-contains-element apple "@{fruits[@]}" && echo 'contains apple'
+#   contains apple
+#
+#   $ if $(_bash-it-array-contains-element pear "${fruits[@]}"); then
+#       echo "contains pear!"
+#     fi
+#   contains pear!
+#
+#
+_bash-it-array-contains-element() {
+  local e
+  for e in "${@:2}"; do
+    [[ "$e" == "$1" ]] && return 0
+  done
+  return 1
+}
+
+# Dedupe a simple array of words without spaces.
+_bash-it-array-dedup() {
+  echo "$*" | tr ' ' '\n' | sort -u | tr '\n' ' '
+}
+
+# Outputs a full path of the grep found on the filesystem
+_bash-it-grep() {
+  if [[ -z "${BASH_IT_GREP}" ]] ; then
+    export BASH_IT_GREP="$(which egrep || which grep || '/usr/bin/grep')"
+  fi
+  printf "%s " "${BASH_IT_GREP}"
+}
+
+
 ###########################################################################
 # Component-specific functions (component is either an alias, a plugin, or a
 # completion).
@@ -50,51 +95,6 @@ _bash-it-clean-component-cache() {
   fi
 }
 
-###########################################################################
-# Generic utilies
-###########################################################################
-
-# This function searches an array for an exact match against the term passed
-# as the first argument to the function. This function exits as soon as
-# a match is found.
-#
-# Returns:
-#   0 when a match is found, otherwise 1.
-#
-# Examples:
-#   $ declare -a fruits=(apple orange pear mandarin)
-#
-#   $ _bash-it-array-contains-element apple "@{fruits[@]}" && echo 'contains apple'
-#   contains apple
-#
-#   $ if $(_bash-it-array-contains-element pear "${fruits[@]}"); then
-#       echo "contains pear!"
-#     fi
-#   contains pear!
-#
-#
-_bash-it-array-contains-element() {
-  local e
-  for e in "${@:2}"; do
-    [[ "$e" == "$1" ]] && return 0
-  done
-  return 1
-}
-
-# Dedupe a simple array of words without spaces.
-_bash-it-array-dedup() {
-  echo "$*" | tr ' ' '\n' | sort -u | tr '\n' ' '
-}
-
-# Outputs a full path of the grep found on the filesystem
-_bash-it-grep() {
-  if [[ -z "${BASH_IT_GREP}" ]] ; then
-    export BASH_IT_GREP="$(which egrep || which grep || '/usr/bin/grep')"
-  fi
-  printf "%s " "${BASH_IT_GREP}"
-}
-
-
 # Returns an array of items within each compoenent.
 _bash-it-component-list() {
   local component="$1"

From c0af591f2f181970b49ae230d05a7655d81b30b7 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Mon, 9 Mar 2020 17:24:18 +0400
Subject: [PATCH 123/388] Add theme barbuk

---
 themes/barbuk/README.md         | 24 ++++++++++
 themes/barbuk/barbuk.theme.bash | 80 +++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 themes/barbuk/README.md
 create mode 100644 themes/barbuk/barbuk.theme.bash

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
new file mode 100644
index 00000000..614940b4
--- /dev/null
+++ b/themes/barbuk/README.md
@@ -0,0 +1,24 @@
+# BarbUk theme
+
+A minimal theme with a clean git prompt
+
+## Provided Information
+
+* Current git remote tool logo (support: github, gitlab, bitbucket)
+* Current path (red when user is root)
+* Current git info
+* Last command exit code (only shown when the exit code is greater than 0)
+
+## Examples
+
+### Clean
+
+```bash
+ ~ ❯ 
+```
+
+### Git
+
+```bash
+   ~/.dotfiles on  master ⤏  origin ↑2 •7 ✗ ❯
+ ```
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
new file mode 100644
index 00000000..971cdd91
--- /dev/null
+++ b/themes/barbuk/barbuk.theme.bash
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# shellcheck disable=2034,2154
+
+SCM_GIT_CHAR_GITLAB='  '
+SCM_GIT_CHAR_BITBUCKET='  '
+SCM_GIT_CHAR_GITHUB='  '
+SCM_GIT_CHAR_DEFAULT='  '
+SCM_GIT_CHAR_ICON_BRANCH=''
+SCM_HG_CHAR='☿ '
+SCM_SVN_CHAR='⑆ '
+SCM_NONE_CHAR=
+SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+SCM_THEME_PROMPT_PREFIX="|"
+SCM_THEME_PROMPT_SUFFIX="${green}| "
+SCM_GIT_BEHIND_CHAR="${bold_red}↓${normal}"
+SCM_GIT_AHEAD_CHAR="${bold_green}↑${normal}"
+SCM_GIT_UNTRACKED_CHAR="⌀"
+SCM_GIT_UNSTAGED_CHAR="${bold_yellow}•${normal}"
+SCM_GIT_STAGED_CHAR="${bold_green}+${normal}"
+GIT_THEME_PROMPT_DIRTY=" ${bold_red}✗"
+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
+EXIT_CODE_ICON=' '
+
+function _git-uptream-remote-logo {
+    [[ "$(_git-upstream)" == "" ]] && return
+
+    local remote remote_domain
+    remote=$(_git-upstream-remote)
+    remote_domain=$(git config --get remote."$remote".url | awk -F'[@:.]' '{print $2}')
+
+    # remove // suffix for https:// url
+    remote_domain=${remote_domain//\//}
+
+    case $remote_domain in
+        github ) SCM_GIT_CHAR="$SCM_GIT_CHAR_GITHUB";;
+        gitlab ) SCM_GIT_CHAR="$SCM_GIT_CHAR_GITLAB";;
+        bitbucket ) SCM_GIT_CHAR="$SCM_GIT_CHAR_BITBUCKET";;
+        * ) SCM_GIT_CHAR="$SCM_GIT_CHAR_DEFAULT";;
+    esac
+}
+
+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
+
+    _exit-code exit_code
+    _git-uptream-remote-logo
+
+    history -a
+
+    # Detect root shell
+    if [ "$(whoami)" = root ]; then
+        dir_color=$red
+    fi
+
+    PS1="\\n ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
+
+    [[ ${#PS1} -gt $((COLUMNS*3)) ]] && wrap_char="\\n"
+    PS1="${PS1}${wrap_char}❯${normal} "
+}
+
+safe_append_prompt_command _prompt

From 2e53796d498f75229844882ecbf448ce61e5593f Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 9 Mar 2020 16:07:59 +0100
Subject: [PATCH 124/388] Added comment for docker-compose-fresh alias

Closes #1513
---
 aliases/available/docker-compose.aliases.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aliases/available/docker-compose.aliases.bash b/aliases/available/docker-compose.aliases.bash
index f23c2689..82b39577 100644
--- a/aliases/available/docker-compose.aliases.bash
+++ b/aliases/available/docker-compose.aliases.bash
@@ -2,6 +2,8 @@ cite 'about-alias'
 about-alias 'docker-compose abbreviations'
 
 alias dco="docker-compose"
+
+# Defined in the `docker-compose` plugin, please check there for details.
 alias dcofresh="docker-compose-fresh"
 alias dcol="docker-compose logs -f --tail 100"
 alias dcou="docker-compose up"

From 6419d9246d969483d1fec361095f723d484672e8 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Mon, 9 Mar 2020 12:38:05 -0700
Subject: [PATCH 125/388] Add cht.sh plugin

---
 plugins/available/cht-sh.plugin.bash | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/available/cht-sh.plugin.bash

diff --git a/plugins/available/cht-sh.plugin.bash b/plugins/available/cht-sh.plugin.bash
new file mode 100644
index 00000000..bc9dcd6c
--- /dev/null
+++ b/plugins/available/cht-sh.plugin.bash
@@ -0,0 +1,9 @@
+cite about-plugin
+about-plugin 'Simplify `curl cht.sh/<query>` to `cht.sh <query>`'
+
+# Play nicely if user already installed cht.sh cli tool
+if ! _command_exists cht.sh ; then
+	function cht.sh () {
+		curl "cht.sh/$1"
+	}
+fi

From 58d3acfd88dc772116ecd84a30e34b2d75cf147d Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sat, 7 Mar 2020 21:05:00 -0600
Subject: [PATCH 126/388] add goenv plugin

---
 plugins/available/goenv.plugin.bash | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/available/goenv.plugin.bash

diff --git a/plugins/available/goenv.plugin.bash b/plugins/available/goenv.plugin.bash
new file mode 100644
index 00000000..584365b7
--- /dev/null
+++ b/plugins/available/goenv.plugin.bash
@@ -0,0 +1,18 @@
+cite about-plugin
+about-plugin 'load goenv, if you are using it'
+
+# Don't modify the environment if we can't find the tool:
+# - Check if in $PATH already
+# - Check if installed manually to $HOME
+_command_exists goenv ||
+  [[ -x "$HOME/.goenv/bin/goenv" ]] ||
+  return
+
+# Set GOENV_ROOT, if not already set
+export GOENV_ROOT="${GOENV_ROOT:-$HOME/.goenv}"
+
+# Add GOENV_ROOT/bin to PATH, if that's where it's installed
+[[ -x "$HOME/.goenv/bin/goenv" ]] && pathmunge "$GOENV_ROOT/bin"
+
+# Initialize goenv
+eval "$(goenv init - bash)"

From 8e9dadfaad19d71d6901dd76013bc27607235645 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 10 Mar 2020 22:58:39 -0700
Subject: [PATCH 127/388] Adds metadata + support for multiple arguments

---
 plugins/available/cht-sh.plugin.bash | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/available/cht-sh.plugin.bash b/plugins/available/cht-sh.plugin.bash
index bc9dcd6c..92846989 100644
--- a/plugins/available/cht-sh.plugin.bash
+++ b/plugins/available/cht-sh.plugin.bash
@@ -4,6 +4,17 @@ about-plugin 'Simplify `curl cht.sh/<query>` to `cht.sh <query>`'
 # Play nicely if user already installed cht.sh cli tool
 if ! _command_exists cht.sh ; then
 	function cht.sh () {
-		curl "cht.sh/$1"
+		about 'Executes a cht.sh curl query using the provided arguments'
+		param ' [ ( topic [sub-topic] ) | ~keyword ] [ :list | :help | :learn ]'
+		example '$ cht.sh :help'
+		example '$ cht.sh :list'
+		example '$ cht.sh tar'
+		example '$ cht.sh js "parse json"'
+		example '$ cht.sh python :learn'
+		example '$ cht.sh rust :list'
+		group 'cht-sh'
+
+		local query=$(IFS=/ ; echo "$*")
+		curl "cht.sh/${query}"
 	}
 fi

From ab7f15bee15cc75c85aad3bed212d124925c6f29 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 10 Mar 2020 23:02:33 -0700
Subject: [PATCH 128/388] Added a comment

---
 plugins/available/cht-sh.plugin.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/available/cht-sh.plugin.bash b/plugins/available/cht-sh.plugin.bash
index 92846989..63e3c9b7 100644
--- a/plugins/available/cht-sh.plugin.bash
+++ b/plugins/available/cht-sh.plugin.bash
@@ -14,6 +14,7 @@ if ! _command_exists cht.sh ; then
 		example '$ cht.sh rust :list'
 		group 'cht-sh'
 
+		# Separate arguments with '/', preserving spaces within them
 		local query=$(IFS=/ ; echo "$*")
 		curl "cht.sh/${query}"
 	}

From 1bf9bbde0d133564b106e3d201a6216403ef3ada Mon Sep 17 00:00:00 2001
From: Eduardo Bellido Bellido <edubxb@gmail.com>
Date: Sat, 14 Mar 2020 22:56:25 +0100
Subject: [PATCH 129/388] Use new line character instead semicolon in the
 preexec hook

---
 lib/preexec.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/preexec.bash b/lib/preexec.bash
index 87922946..2386f46a 100644
--- a/lib/preexec.bash
+++ b/lib/preexec.bash
@@ -123,7 +123,7 @@ function preexec_install () {
 
     # Finally, install the actual traps.
     if [[ ! -z "${PROMPT_COMMAND// }" ]]; then
-      PROMPT_COMMAND="${PROMPT_COMMAND};preexec_invoke_cmd"
+      PROMPT_COMMAND="${PROMPT_COMMAND}"$'\n'"preexec_invoke_cmd"
     else
       PROMPT_COMMAND="preexec_invoke_cmd"
     fi

From 167dc43a87652f60e6cac97de2be2509356ac7f8 Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Wed, 18 Mar 2020 14:07:22 +0800
Subject: [PATCH 130/388] envy theme add python virtual_env display support.

---
 themes/envy/envy.theme.bash | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/themes/envy/envy.theme.bash b/themes/envy/envy.theme.bash
index 277e3751..ae8e411b 100644
--- a/themes/envy/envy.theme.bash
+++ b/themes/envy/envy.theme.bash
@@ -6,11 +6,24 @@ SCM_THEME_PROMPT_SUFFIX="${green}|"
 
 GIT_THEME_PROMPT_DIRTY=" ${red}✗"
 GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
-GIT_THEME_PROMPT_PREFIX=" ${green}|"
+GIT_THEME_PROMPT_PREFIX=" ${green}| "
 GIT_THEME_PROMPT_SUFFIX="${green}|"
 
+# virtualenv prompts
+VIRTUALENV_CHAR="ⓔ "
+VIRTUALENV_THEME_PROMPT_PREFIX=""
+VIRTUALENV_THEME_PROMPT_SUFFIX=""
+
+# Display virtual environment info
+function virtualenv_prompt {
+  if [[ -n "$VIRTUAL_ENV" ]]; then
+    virtualenv=`basename "$VIRTUAL_ENV"`
+    echo -e "$VIRTUALENV_CHAR$virtualenv "
+  fi
+}
+
 function prompt_command() {
-    PS1="\n${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
+    PS1="\n${yellow}$(virtualenv_prompt)${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
 }
 
 safe_append_prompt_command prompt_command

From 7f8652999b4848ef819557b9f40b34d6fb9ccbbc Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Thu, 19 Mar 2020 21:27:54 +0800
Subject: [PATCH 131/388] fix code review issues.

---
 themes/envy/envy.theme.bash | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/themes/envy/envy.theme.bash b/themes/envy/envy.theme.bash
index ae8e411b..f4f09be8 100644
--- a/themes/envy/envy.theme.bash
+++ b/themes/envy/envy.theme.bash
@@ -6,24 +6,14 @@ SCM_THEME_PROMPT_SUFFIX="${green}|"
 
 GIT_THEME_PROMPT_DIRTY=" ${red}✗"
 GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
-GIT_THEME_PROMPT_PREFIX=" ${green}| "
+GIT_THEME_PROMPT_PREFIX=" ${green}|"
 GIT_THEME_PROMPT_SUFFIX="${green}|"
 
-# virtualenv prompts
-VIRTUALENV_CHAR="ⓔ "
-VIRTUALENV_THEME_PROMPT_PREFIX=""
+VIRTUALENV_THEME_PROMPT_PREFIX="${green}ⓔ  "
 VIRTUALENV_THEME_PROMPT_SUFFIX=""
 
-# Display virtual environment info
-function virtualenv_prompt {
-  if [[ -n "$VIRTUAL_ENV" ]]; then
-    virtualenv=`basename "$VIRTUAL_ENV"`
-    echo -e "$VIRTUALENV_CHAR$virtualenv "
-  fi
-}
-
 function prompt_command() {
-    PS1="\n${yellow}$(virtualenv_prompt)${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
+    PS1="\n$(virtualenv_prompt)${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
 }
 
 safe_append_prompt_command prompt_command

From fd162c078695dadc2a42d6cdf817811de3b52bde Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Fri, 20 Mar 2020 09:44:06 +0800
Subject: [PATCH 132/388] add RUBY_VERSION_PROMPT_DISABLED parameter for PS1
 prompt.

---
 themes/base.theme.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index d5858018..5e31d7ca 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -371,7 +371,9 @@ function chruby_version_prompt {
 }
 
 function ruby_version_prompt {
-  echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
+  if [ -z "${RUBY_VERSION_PROMPT_DISABLED}" ]; then
+    echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
+  fi
 }
 
 function k8s_context_prompt {

From 21885dabb4e4f858736de906468bd5bc0193955f Mon Sep 17 00:00:00 2001
From: salex <salex@gmail.com>
Date: Fri, 20 Mar 2020 19:25:45 +0800
Subject: [PATCH 133/388] add THEME_SHOW_RUBY_PROMPT.

---
 themes/base.theme.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 5e31d7ca..7452eb9f 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -68,6 +68,8 @@ NVM_THEME_PROMPT_SUFFIX='|'
 RVM_THEME_PROMPT_PREFIX=' |'
 RVM_THEME_PROMPT_SUFFIX='|'
 
+THEME_SHOW_RUBY_PROMPT=${THEME_SHOW_RUBY_PROMPT:=true}
+
 THEME_SHOW_USER_HOST=${THEME_SHOW_USER_HOST:=false}
 USER_HOST_THEME_PROMPT_PREFIX=''
 USER_HOST_THEME_PROMPT_SUFFIX=''
@@ -371,7 +373,7 @@ function chruby_version_prompt {
 }
 
 function ruby_version_prompt {
-  if [ -z "${RUBY_VERSION_PROMPT_DISABLED}" ]; then
+  if [[ "${THEME_SHOW_RUBY_PROMPT}" = "true" ]]; then
     echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
   fi
 }

From 7a347b2c51e85bb85986ea05a7bd5fe305c1053a Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew@matthewadams.me>
Date: Fri, 20 Mar 2020 14:04:23 -0500
Subject: [PATCH 134/388] netshoot alias for k8s

Provides a quick bash prompt in the k8s cluster using https://hub.docker.com/r/nicolaka/netshoot
---
 aliases/available/kubectl.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/kubectl.aliases.bash b/aliases/available/kubectl.aliases.bash
index 58670ce5..0322c931 100644
--- a/aliases/available/kubectl.aliases.bash
+++ b/aliases/available/kubectl.aliases.bash
@@ -18,6 +18,7 @@ function _set_pkg_aliases()
     alias kcdn='kubectl describe node'
     alias kcgpan='kubectl get pods --all-namespaces'
     alias kcgdan='kubectl get deployments --all-namespaces'
+    alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(uuidgen | tr A-Z a-z | sed 's/-//g') --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
 	fi
 }
 

From 287d9d4b4f1942319468512132630277e0138a25 Mon Sep 17 00:00:00 2001
From: All Your Code <ucomesdag@users.noreply.github.com>
Date: Sun, 22 Mar 2020 15:12:40 +0100
Subject: [PATCH 135/388] Update vagrant.completion.bash

Fixed command options changes of the Vagrant command. Completion has been broken for a while, especially the snapshot options.
---
 completion/available/vagrant.completion.bash | 30 +++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/completion/available/vagrant.completion.bash b/completion/available/vagrant.completion.bash
index e0abb7af..0803893f 100644
--- a/completion/available/vagrant.completion.bash
+++ b/completion/available/vagrant.completion.bash
@@ -53,7 +53,7 @@ __vagrantinvestigate() {
 _vagrant() {
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
-    commands="snapshot box connect destroy docker-logs docker-run global-status halt help init list-commands login package plugin provision rdp reload resume rsync rsync-auto share ssh ssh-config status suspend up version"
+    commands="box cloud destroy global-status halt help hostmanager init login package plugin port powershell provision push rdp reload resume scp snapshot ssh ssh-config status suspend up upload validate vbguest version winrm winrm-config"
 
     if [ $COMP_CWORD == 1 ]
     then
@@ -91,12 +91,12 @@ _vagrant() {
                 return 0
                 ;;
             "box")
-                box_commands="add help list remove repackage"
+                box_commands="add list outdated prune remove repackage update"
                 COMPREPLY=($(compgen -W "${box_commands}" -- ${cur}))
                 return 0
                 ;;
             "plugin")
-                plugin_commands="install license list uninstall update"
+                plugin_commands="expunge install license list repair uninstall update"
                 COMPREPLY=($(compgen -W "${plugin_commands}" -- ${cur}))
                 return 0
                 ;;
@@ -105,7 +105,7 @@ _vagrant() {
                 return 0
                 ;;
             "snapshot")
-                snapshot_commands="back delete go list take"
+                snapshot_commands="delete list pop push restore save"
                 COMPREPLY=($(compgen -W "${snapshot_commands}" -- ${cur}))
                 return 0
                 ;;
@@ -135,13 +135,29 @@ _vagrant() {
               esac
               ;;
           "snapshot")
-              if [ "$prev" == "go" ]; then
-                  local snapshot_list=$(vagrant snapshot list | awk '/Name:/ { print $2 }')
-                  COMPREPLY=($(compgen -W "${snapshot_list}" -- ${cur}))
+              if [ "$prev" == "restore" ]; then
+                  COMPREPLY=($(compgen -W "${vm_list}" -- ${cur}))
                   return 0
               fi
               ;;
       esac
     fi
+
+    if [ $COMP_CWORD == 4 ]
+    then
+      action="${COMP_WORDS[COMP_CWORD-3]}"
+      prev="${COMP_WORDS[COMP_CWORD-2]}"
+      case "$action" in
+          "snapshot")
+              if [ "$prev" == "restore" ]; then
+                  local snapshot_list="$(vagrant snapshot list ${cur} 2>/dev/null | awk '{ORS=" "} /==>/ {next} {print}')"
+                  COMPREPLY=($(compgen -W "${snapshot_list}" -- ${cur}))
+                  return 0
+              fi
+              ;;
+          *)
+          ;;
+      esac
+    fi
 }
 complete -F _vagrant vagrant

From 30ae4d9e5f822494b704f6780e05cc1bd41dddb0 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 25 Mar 2020 09:49:51 -0700
Subject: [PATCH 136/388] Add git switch aliases (gsw*)

---
 aliases/available/git.aliases.bash | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index e784dade..6da2450f 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -87,6 +87,11 @@ alias gstb="git stash branch"
 alias gstd="git stash drop"
 alias gstl="git stash list"
 alias gstp="git stash pop"
+# Switch aliases - Requires git v2.23+
+alias gsw="git switch"
+alias gswm="git switch master"
+alias gswc="git switch -c"
+alias gswt="git switch -t"
 alias gh='cd "$(git rev-parse --show-toplevel)"'
 # Show untracked files
 alias gu='git ls-files . --exclude-standard --others'

From 0274d36cd78d78f3e1f21c4299f2ac1c6b8967e8 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 25 Mar 2020 10:04:27 -0700
Subject: [PATCH 137/388] Use long option values

---
 aliases/available/git.aliases.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 6da2450f..270211ac 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -90,8 +90,8 @@ alias gstp="git stash pop"
 # Switch aliases - Requires git v2.23+
 alias gsw="git switch"
 alias gswm="git switch master"
-alias gswc="git switch -c"
-alias gswt="git switch -t"
+alias gswc="git switch --create"
+alias gswt="git switch --track"
 alias gh='cd "$(git rev-parse --show-toplevel)"'
 # Show untracked files
 alias gu='git ls-files . --exclude-standard --others'

From f52453c643be2e0b796e9b5e3faf892875ec294c Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 25 Mar 2020 11:29:12 -0700
Subject: [PATCH 138/388] Fix goenv plugin

---
 plugins/available/goenv.plugin.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/available/goenv.plugin.bash b/plugins/available/goenv.plugin.bash
index 584365b7..ecc1b1c2 100644
--- a/plugins/available/goenv.plugin.bash
+++ b/plugins/available/goenv.plugin.bash
@@ -3,8 +3,10 @@ about-plugin 'load goenv, if you are using it'
 
 # Don't modify the environment if we can't find the tool:
 # - Check if in $PATH already
+# - Check if installed manually to $GOENV_ROOT
 # - Check if installed manually to $HOME
 _command_exists goenv ||
+  [[ -n "$GOENV_ROOT" && -x "$GOENV_ROOT/bin/goenv" ]] ||
   [[ -x "$HOME/.goenv/bin/goenv" ]] ||
   return
 
@@ -12,7 +14,7 @@ _command_exists goenv ||
 export GOENV_ROOT="${GOENV_ROOT:-$HOME/.goenv}"
 
 # Add GOENV_ROOT/bin to PATH, if that's where it's installed
-[[ -x "$HOME/.goenv/bin/goenv" ]] && pathmunge "$GOENV_ROOT/bin"
+! _command_exists goenv && [[ -x "$GOENV_ROOT/bin/goenv" ]] && pathmunge "$GOENV_ROOT/bin"
 
 # Initialize goenv
 eval "$(goenv init - bash)"

From 5654874aee78d20aea796af9a235c72c81fd3172 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Mon, 30 Mar 2020 01:36:58 +0400
Subject: [PATCH 139/388] Documentation: font usage for theme barbuk

---
 themes/barbuk/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 614940b4..d24ced21 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -9,6 +9,12 @@ A minimal theme with a clean git prompt
 * Current git info
 * Last command exit code (only shown when the exit code is greater than 0)
 
+## Font
+
+A font with SCM glyph is required to display git remote tool logo.
+You can use a font from https://www.nerdfonts.com/ or patch your own font with the tool
+provided by https://github.com/ryanoasis/nerd-fonts
+
 ## Examples
 
 ### Clean

From 611d4f234f455294bfe4b6c540ad3aca4825060d Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Mon, 30 Mar 2020 02:11:30 +0400
Subject: [PATCH 140/388] Update font documentation

---
 themes/barbuk/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index d24ced21..de218b30 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -11,9 +11,11 @@ A minimal theme with a clean git prompt
 
 ## Font
 
-A font with SCM glyph is required to display git remote tool logo.
+A font with SCM glyphs is required to display the default tool/host logos.
 You can use a font from https://www.nerdfonts.com/ or patch your own font with the tool
-provided by https://github.com/ryanoasis/nerd-fonts
+provided by https://github.com/ryanoasis/nerd-fonts.
+
+You can also override the default variables if you want to use different glyphs or standard ASCII characters.
 
 ## Examples
 

From f4cc8ddb77d21f968bbc60cdab62a6ddb8c5b2ed Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Mon, 30 Mar 2020 14:23:58 +0400
Subject: [PATCH 141/388] Allow git glyphs customization

---
 themes/barbuk/README.md         | 23 ++++++++++++++++++++++-
 themes/barbuk/barbuk.theme.bash | 15 +++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index de218b30..cc188190 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -9,7 +9,7 @@ A minimal theme with a clean git prompt
 * Current git info
 * Last command exit code (only shown when the exit code is greater than 0)
 
-## Font
+## Fonts and glyphs
 
 A font with SCM glyphs is required to display the default tool/host logos.
 You can use a font from https://www.nerdfonts.com/ or patch your own font with the tool
@@ -17,6 +17,26 @@ provided by https://github.com/ryanoasis/nerd-fonts.
 
 You can also override the default variables if you want to use different glyphs or standard ASCII characters.
 
+### Default theme glyphs
+
+```bash
+SCM_GIT_CHAR_GITLAB='  '
+SCM_GIT_CHAR_BITBUCKET='  '
+SCM_GIT_CHAR_GITHUB='  '
+SCM_GIT_CHAR_DEFAULT='  '
+SCM_GIT_CHAR_ICON_BRANCH=''
+EXIT_CODE_ICON=' '
+```
+
+### Customize glyphs
+
+Define your custom glyphs before sourcing bash-it:
+
+```bash
+SCM_GIT_CHAR_GITHUB='•'
+source "$BASH_IT"/bash_it.sh
+```
+
 ## Examples
 
 ### Clean
@@ -30,3 +50,4 @@ You can also override the default variables if you want to use different glyphs
 ```bash
    ~/.dotfiles on  master ⤏  origin ↑2 •7 ✗ ❯
  ```
+
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 971cdd91..39d4995e 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -1,11 +1,15 @@
 #!/usr/bin/env bash
 # shellcheck disable=2034,2154
 
-SCM_GIT_CHAR_GITLAB='  '
-SCM_GIT_CHAR_BITBUCKET='  '
-SCM_GIT_CHAR_GITHUB='  '
-SCM_GIT_CHAR_DEFAULT='  '
-SCM_GIT_CHAR_ICON_BRANCH=''
+# Theme custom glyphs
+SCM_GIT_CHAR_GITLAB=${SCM_GITLAB_CHAR:='  '}
+SCM_GIT_CHAR_BITBUCKET=${SCM_GIT_CHAR_BITBUCKET:='  '}
+SCM_GIT_CHAR_GITHUB=${SCM_GIT_CHAR_GITHUB:='  '}
+SCM_GIT_CHAR_DEFAULT=${SCM_GIT_CHAR_DEFAULT:='  '}
+SCM_GIT_CHAR_ICON_BRANCH=${SCM_GIT_CHAR_ICON_BRANCH:=''}
+EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
+
+# Bash-it default glyphs customization
 SCM_HG_CHAR='☿ '
 SCM_SVN_CHAR='⑆ '
 SCM_NONE_CHAR=
@@ -25,7 +29,6 @@ GIT_THEME_PROMPT_SUFFIX="${cyan}"
 SCM_THEME_BRANCH_TRACK_PREFIX="${normal} ⤏  ${cyan}"
 SCM_THEME_CURRENT_USER_PREFFIX='  '
 SCM_GIT_SHOW_CURRENT_USER=false
-EXIT_CODE_ICON=' '
 
 function _git-uptream-remote-logo {
     [[ "$(_git-upstream)" == "" ]] && return

From 303e0a937e33634cb46d965134cf74b7c6cd530f Mon Sep 17 00:00:00 2001
From: buhl <221842+buhl@users.noreply.github.com>
Date: Mon, 30 Mar 2020 21:46:46 +0200
Subject: [PATCH 142/388] Simplified-sudo-check

---
 themes/powerline/powerline.base.bash | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 969b210d..8c983a7b 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -18,9 +18,7 @@ function __powerline_user_info_prompt {
   local color=${USER_INFO_THEME_PROMPT_COLOR}
 
   if [[ "${THEME_CHECK_SUDO}" = true ]]; then
-    if sudo -n uptime 2>&1 | grep -q "load"; then
-      color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
-    fi
+    sudo -vn 1>/dev/null 2>&1 && color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
   fi
 
   case "${POWERLINE_PROMPT_USER_INFO_MODE}" in

From 81c4ed70ea1d36a2f8677865bd6f73041d11c032 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Tue, 31 Mar 2020 12:15:28 +0400
Subject: [PATCH 143/388] Add user@host information for ssh session

---
 themes/barbuk/barbuk.theme.bash | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 39d4995e..372b8a0d 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -31,7 +31,7 @@ SCM_THEME_CURRENT_USER_PREFFIX='  '
 SCM_GIT_SHOW_CURRENT_USER=false
 
 function _git-uptream-remote-logo {
-    [[ "$(_git-upstream)" == "" ]] && return
+    [[ "$(_git-upstream)" == "" ]] && SCM_GIT_CHAR="$SCM_GIT_CHAR_DEFAULT"
 
     local remote remote_domain
     remote=$(_git-upstream-remote)
@@ -62,7 +62,7 @@ function _exit-code {
 }
 
 function _prompt {
-    local exit_code="$?" wrap_char=' ' dir_color=$green
+    local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info=''
 
     _exit-code exit_code
     _git-uptream-remote-logo
@@ -74,7 +74,12 @@ function _prompt {
         dir_color=$red
     fi
 
-    PS1="\\n ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
+    # Detect ssh
+    if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
+        ssh_info="${bold_blue}\u${bold_orange}@${cyan}\H ${bold_orange}in"
+    fi
+
+    PS1="\\n${ssh_info} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
 
     [[ ${#PS1} -gt $((COLUMNS*3)) ]] && wrap_char="\\n"
     PS1="${PS1}${wrap_char}❯${normal} "

From 337ed0de9aea4eb4c5bc07a2194bcebc06f537de Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Tue, 31 Mar 2020 12:16:06 +0400
Subject: [PATCH 144/388] Documentation for ssh and sudoer configuration

---
 themes/barbuk/README.md | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index cc188190..372560e4 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -8,6 +8,7 @@ A minimal theme with a clean git prompt
 * Current path (red when user is root)
 * Current git info
 * Last command exit code (only shown when the exit code is greater than 0)
+* user@host for ssh connection
 
 ## Fonts and glyphs
 
@@ -37,6 +38,26 @@ SCM_GIT_CHAR_GITHUB='•'
 source "$BASH_IT"/bash_it.sh
 ```
 
+## SSH prompt and sudoers
+
+If you want the theme to persist using `sudo -s` in a ssh session, you need to configure sudo to keep the `HOME` and `SSH_CONNECTION` environment variables.
+
+`HOME` contains the path to the home directory of the current user. Keeping it will allow to use your user dotfiles when elevating privileges.
+
+Keeping `SSH_CONNECTION` env is necessary for ssh detection in the theme.
+
+Please refer to the following documentation for more information:
+ -  [sudo manual](https://www.sudo.ws/man/1.8.13/sudoers.man.html) for `env_keep` configuration
+ -  [openssh manual](https://linux.die.net/man/1/ssh) for information about `SSH_CONNECTION` environment
+
+```bash
+cat << EOF > /etc/sudoers.d/keepenv
+Defaults env_keep += HOME
+Defaults env_keep += SSH_CONNECTION
+EOF
+chmod 400 /etc/sudoers.d/keepenv
+```
+
 ## Examples
 
 ### Clean
@@ -49,5 +70,10 @@ source "$BASH_IT"/bash_it.sh
 
 ```bash
    ~/.dotfiles on  master ⤏  origin ↑2 •7 ✗ ❯
- ```
+```
 
+### Ssh
+
+```bash
+user@fqdn in  ~/bash-it on  master ✓ ❯
+```

From 8c44bae797760f697df8d821f56b217acb4d4878 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 10:12:19 -0700
Subject: [PATCH 145/388] theme/barbuk: Update prefix for overrides

---
 themes/barbuk/README.md         | 15 +++++++++------
 themes/barbuk/barbuk.theme.bash | 18 +++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index cc188190..52727e04 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -20,12 +20,15 @@ You can also override the default variables if you want to use different glyphs
 ### Default theme glyphs
 
 ```bash
-SCM_GIT_CHAR_GITLAB='  '
-SCM_GIT_CHAR_BITBUCKET='  '
-SCM_GIT_CHAR_GITHUB='  '
-SCM_GIT_CHAR_DEFAULT='  '
-SCM_GIT_CHAR_ICON_BRANCH=''
-EXIT_CODE_ICON=' '
+BARBUK_GITLAB_CHAR='  '
+BARBUK_BITBUCKET_CHAR='  '
+BARBUK_GITHUB_CHAR='  '
+BARBUK_GIT_DEFAULT_CHAR='  '
+BARBUK_GIT_BRANCH_ICON=''
+BARBUK_HG_CHAR='☿ '
+BARBUK_SVN_CHAR='⑆ '
+BARBUK_NO_SCM_CHAR=''
+BARBUK_EXIT_CODE_ICON=' '
 ```
 
 ### Customize glyphs
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 39d4995e..ec2ac7b8 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -2,17 +2,17 @@
 # shellcheck disable=2034,2154
 
 # Theme custom glyphs
-SCM_GIT_CHAR_GITLAB=${SCM_GITLAB_CHAR:='  '}
-SCM_GIT_CHAR_BITBUCKET=${SCM_GIT_CHAR_BITBUCKET:='  '}
-SCM_GIT_CHAR_GITHUB=${SCM_GIT_CHAR_GITHUB:='  '}
-SCM_GIT_CHAR_DEFAULT=${SCM_GIT_CHAR_DEFAULT:='  '}
-SCM_GIT_CHAR_ICON_BRANCH=${SCM_GIT_CHAR_ICON_BRANCH:=''}
-EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
+SCM_GIT_CHAR_GITLAB=${BARBUK_GITLAB_CHAR:='  '}
+SCM_GIT_CHAR_BITBUCKET=${BARBUK_BITBUCKET_CHAR:='  '}
+SCM_GIT_CHAR_GITHUB=${BARBUK_GITHUB_CHAR:='  '}
+SCM_GIT_CHAR_DEFAULT=${BARBUK_GIT_DEFAULT_CHAR:='  '}
+SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
+SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
+SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
+SCM_NONE_CHAR=${BARBUK_NO_SCM_CHAR:=''}
+EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
 
 # Bash-it default glyphs customization
-SCM_HG_CHAR='☿ '
-SCM_SVN_CHAR='⑆ '
-SCM_NONE_CHAR=
 SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX="|"

From 9e443009ac7d7c2a95df2f629afb21edd835ef31 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 10:15:22 -0700
Subject: [PATCH 146/388] theme/barbuk: Update prefix for overrides

---
 themes/barbuk/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 52727e04..8cf4be76 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -36,7 +36,7 @@ BARBUK_EXIT_CODE_ICON=' '
 Define your custom glyphs before sourcing bash-it:
 
 ```bash
-SCM_GIT_CHAR_GITHUB='•'
+export BARBUK_GITHUB_CHAR='•'
 source "$BASH_IT"/bash_it.sh
 ```
 

From 6943996f0b2cdcaf972b3ec324631435fdf63fd9 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 10:21:02 -0700
Subject: [PATCH 147/388] Revert the NONE_CHAR override

---
 themes/barbuk/README.md         | 1 -
 themes/barbuk/barbuk.theme.bash | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 8cf4be76..4646a49a 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -27,7 +27,6 @@ BARBUK_GIT_DEFAULT_CHAR='  '
 BARBUK_GIT_BRANCH_ICON=''
 BARBUK_HG_CHAR='☿ '
 BARBUK_SVN_CHAR='⑆ '
-BARBUK_NO_SCM_CHAR=''
 BARBUK_EXIT_CODE_ICON=' '
 ```
 
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index ec2ac7b8..44b5237a 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -9,10 +9,10 @@ SCM_GIT_CHAR_DEFAULT=${BARBUK_GIT_DEFAULT_CHAR:='  '}
 SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
 SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
 SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
-SCM_NONE_CHAR=${BARBUK_NO_SCM_CHAR:=''}
 EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
 
 # Bash-it default glyphs customization
+SCM_NONE_CHAR=
 SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX="|"

From d39eb053cfd40fa6c5a6aad9c8eb5208e922496b Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 1 Apr 2020 00:46:58 +0400
Subject: [PATCH 148/388] Allow to disable ssh info

---
 themes/barbuk/barbuk.theme.bash | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 372b8a0d..ead0940a 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -9,6 +9,9 @@ SCM_GIT_CHAR_DEFAULT=${SCM_GIT_CHAR_DEFAULT:='  '}
 SCM_GIT_CHAR_ICON_BRANCH=${SCM_GIT_CHAR_ICON_BRANCH:=''}
 EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
 
+# Ssh user and fqdn display
+SSH_INFO=${BARBUK_SSH_INFO:=true}
+
 # Bash-it default glyphs customization
 SCM_HG_CHAR='☿ '
 SCM_SVN_CHAR='⑆ '
@@ -75,7 +78,7 @@ function _prompt {
     fi
 
     # Detect ssh
-    if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
+    if [[ -n "${SSH_CONNECTION}" ]] && [ "$SSH_INFO" = true ]; then
         ssh_info="${bold_blue}\u${bold_orange}@${cyan}\H ${bold_orange}in"
     fi
 

From 6d0744a9288ed8b29d6fbf2e4886cbe2ec1f7180 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 1 Apr 2020 00:48:11 +0400
Subject: [PATCH 149/388] Update documentation

---
 themes/barbuk/README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 372560e4..736fd0ba 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -38,7 +38,19 @@ SCM_GIT_CHAR_GITHUB='•'
 source "$BASH_IT"/bash_it.sh
 ```
 
-## SSH prompt and sudoers
+## SSH prompt
+
+### Usage
+
+When using a ssh session, the theme will display `user@fqdn`.
+You can disable this information before sourcing bsah-it:
+
+```bash
+export BARBUK_SSH_INFO=false
+source "$BASH_IT"/bash_it.sh
+```
+
+### Keep theme with sudoer
 
 If you want the theme to persist using `sudo -s` in a ssh session, you need to configure sudo to keep the `HOME` and `SSH_CONNECTION` environment variables.
 

From 347995d33e172faea431fc9fa72e40bf5e5f3b88 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 1 Apr 2020 01:02:01 +0400
Subject: [PATCH 150/388] Allow to customize hostname format

---
 themes/barbuk/barbuk.theme.bash | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index ead0940a..2cba4df7 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -11,6 +11,7 @@ EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
 
 # Ssh user and fqdn display
 SSH_INFO=${BARBUK_SSH_INFO:=true}
+HOST_INFO=${BARBUK_HOST_INFO:=long}
 
 # Bash-it default glyphs customization
 SCM_HG_CHAR='☿ '
@@ -65,7 +66,7 @@ function _exit-code {
 }
 
 function _prompt {
-    local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info=''
+    local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' host
 
     _exit-code exit_code
     _git-uptream-remote-logo
@@ -79,7 +80,12 @@ function _prompt {
 
     # Detect ssh
     if [[ -n "${SSH_CONNECTION}" ]] && [ "$SSH_INFO" = true ]; then
-        ssh_info="${bold_blue}\u${bold_orange}@${cyan}\H ${bold_orange}in"
+        if [ "$HOST_INFO" = long ]; then
+            host="\H"
+        else
+            host="\h"
+        fi
+        ssh_info="${bold_blue}\u${bold_orange}@${cyan}$host ${bold_orange}in"
     fi
 
     PS1="\\n${ssh_info} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"

From d79fc5027bb8358e2d70a77c1f0dad96b07d41e6 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 14:02:22 -0700
Subject: [PATCH 151/388] theme/atomic: update sudo check method

---
 themes/atomic/atomic.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/atomic/atomic.theme.bash b/themes/atomic/atomic.theme.bash
index a89aeea3..5f44b34b 100644
--- a/themes/atomic/atomic.theme.bash
+++ b/themes/atomic/atomic.theme.bash
@@ -194,7 +194,7 @@ ___atomic_prompt_char() {
   color=$white
   prompt_char="${__ATOMIC_PROMPT_CHAR_PS1}"
   if [ "${THEME_SHOW_SUDO}" == "true" ]; then
-    if [ $(sudo -n id -u 2>&1 | grep 0) ]; then
+    if sudo -vn 1>/dev/null 2>&1; then
       prompt_char="${__ATOMIC_PROMPT_CHAR_PS1_SUDO}"
     fi
   fi

From 78db4d56f082b9dc9458db915e66904affe3b272 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 1 Apr 2020 01:02:24 +0400
Subject: [PATCH 152/388] Update documentation to explain new BARBUK_HOST_INFO
 configuration

---
 themes/barbuk/README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 736fd0ba..06cce8de 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -42,10 +42,16 @@ source "$BASH_IT"/bash_it.sh
 
 ### Usage
 
-When using a ssh session, the theme will display `user@fqdn`.
-You can disable this information before sourcing bsah-it:
+When using a ssh session, the theme will display `user@hostname`.
+You can disable this information with `BARBUK_SSH_INFO`.
+
+The hostname is display in the FQDN format by default. You
+can use the short hostname format with `BARBUK_HOST_INFO`.
 
 ```bash
+# short or long
+export BARBUK_HOST_INFO=short
+# true or false
 export BARBUK_SSH_INFO=false
 source "$BASH_IT"/bash_it.sh
 ```
@@ -87,5 +93,5 @@ chmod 400 /etc/sudoers.d/keepenv
 ### Ssh
 
 ```bash
-user@fqdn in  ~/bash-it on  master ✓ ❯
+user@hostname in  ~/bash-it on  master ✓ ❯
 ```

From d6d4e4bc7d9f0ea0adf0675510e582593f097f56 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 1 Apr 2020 01:05:15 +0400
Subject: [PATCH 153/388] Fix typo

---
 themes/barbuk/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 06cce8de..c3101734 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -45,7 +45,7 @@ source "$BASH_IT"/bash_it.sh
 When using a ssh session, the theme will display `user@hostname`.
 You can disable this information with `BARBUK_SSH_INFO`.
 
-The hostname is display in the FQDN format by default. You
+The hostname is displayed in the FQDN format by default. You
 can use the short hostname format with `BARBUK_HOST_INFO`.
 
 ```bash

From 0896ff2fb3d245ff39eb7fb91917e26e6c9a3768 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 1 Apr 2020 01:06:33 +0400
Subject: [PATCH 154/388] Use same notation for user@hostname

---
 themes/barbuk/README.md         | 2 +-
 themes/barbuk/barbuk.theme.bash | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index c3101734..dad6e140 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -8,7 +8,7 @@ A minimal theme with a clean git prompt
 * Current path (red when user is root)
 * Current git info
 * Last command exit code (only shown when the exit code is greater than 0)
-* user@host for ssh connection
+* user@hostname for ssh connection
 
 ## Fonts and glyphs
 
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 2cba4df7..7990ca91 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -9,7 +9,7 @@ SCM_GIT_CHAR_DEFAULT=${SCM_GIT_CHAR_DEFAULT:='  '}
 SCM_GIT_CHAR_ICON_BRANCH=${SCM_GIT_CHAR_ICON_BRANCH:=''}
 EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
 
-# Ssh user and fqdn display
+# Ssh user and hostname display
 SSH_INFO=${BARBUK_SSH_INFO:=true}
 HOST_INFO=${BARBUK_HOST_INFO:=long}
 

From 1d6b01018d5227ea52a86c1d29767f139efd781c Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 14:11:05 -0700
Subject: [PATCH 155/388] theme/brainy: Update sudo check method

---
 themes/brainy/brainy.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/brainy/brainy.theme.bash b/themes/brainy/brainy.theme.bash
index e78128aa..e27d9d80 100644
--- a/themes/brainy/brainy.theme.bash
+++ b/themes/brainy/brainy.theme.bash
@@ -90,7 +90,7 @@ ____brainy_bottom() {
 ___brainy_prompt_user_info() {
 	color=$bold_blue
 	if [ "${THEME_SHOW_SUDO}" == "true" ]; then
-		if [ $(sudo -n id -u 2>&1 | grep 0) ]; then
+		if sudo -vn 1>/dev/null 2>&1; then
 			color=$bold_red
 		fi
 	fi

From 3c6ffeb44fd50bdc5d9b07be89293139a6976ca4 Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 1 Apr 2020 12:09:54 +0400
Subject: [PATCH 156/388] Update theme var prefix

---
 themes/barbuk/README.md         | 8 ++++----
 themes/barbuk/barbuk.theme.bash | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index dad6e140..4fe752b4 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -43,16 +43,16 @@ source "$BASH_IT"/bash_it.sh
 ### Usage
 
 When using a ssh session, the theme will display `user@hostname`.
-You can disable this information with `BARBUK_SSH_INFO`.
+You can disable this information with `BASH_IT_THEME_BARBUK_SSH_INFO`.
 
 The hostname is displayed in the FQDN format by default. You
-can use the short hostname format with `BARBUK_HOST_INFO`.
+can use the short hostname format with `BASH_IT_THEME_BARBUK_HOST_INFO`.
 
 ```bash
 # short or long
-export BARBUK_HOST_INFO=short
+export BASH_IT_THEME_BARBUK_HOST_INFO=short
 # true or false
-export BARBUK_SSH_INFO=false
+export BASH_IT_THEME_BARBUK_SSH_INFO=false
 source "$BASH_IT"/bash_it.sh
 ```
 
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 7990ca91..011fec32 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -10,8 +10,8 @@ SCM_GIT_CHAR_ICON_BRANCH=${SCM_GIT_CHAR_ICON_BRANCH:=''}
 EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
 
 # Ssh user and hostname display
-SSH_INFO=${BARBUK_SSH_INFO:=true}
-HOST_INFO=${BARBUK_HOST_INFO:=long}
+SSH_INFO=${BASH_IT_THEME_BARBUK_SSH_INFO:=true}
+HOST_INFO=${BASH_IT_THEME_BARBUK_HOST_INFO:=long}
 
 # Bash-it default glyphs customization
 SCM_HG_CHAR='☿ '

From 5ad244da873b3f6756253ea57ceea6bb45f211b6 Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Thu, 2 Apr 2020 18:59:10 +0530
Subject: [PATCH 157/388] Update ng.completion.bash

---
 completion/available/ng.completion.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/completion/available/ng.completion.bash b/completion/available/ng.completion.bash
index cd191bb2..53361f7a 100644
--- a/completion/available/ng.completion.bash
+++ b/completion/available/ng.completion.bash
@@ -1,3 +1,5 @@
 
-. <(ng completion --bash)
+# . <(ng completion --bash)  obselete
 
+NG_COMMANDS="add build config doc e2e generate help lint new run serve test update version xi18n"
+complete -W "$NG_COMMANDS" ng

From 6b4970136bb3d71c33262feeb47d8347e669f5f4 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 6 Apr 2020 16:08:50 +0200
Subject: [PATCH 158/388] Added a check for the ng command in ng completion

See #1542, #1543
---
 completion/available/ng.completion.bash | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/completion/available/ng.completion.bash b/completion/available/ng.completion.bash
index 53361f7a..827bc22d 100644
--- a/completion/available/ng.completion.bash
+++ b/completion/available/ng.completion.bash
@@ -1,5 +1,9 @@
 
-# . <(ng completion --bash)  obselete
+if _command_exists ng; then
+  # No longer supported, please see https://github.com/angular/angular-cli/issues/11043
+  # Fix courtesy of https://stackoverflow.com/questions/50194674/ng-completion-no-longer-exists
+  # . <(ng completion --bash)
 
-NG_COMMANDS="add build config doc e2e generate help lint new run serve test update version xi18n"
-complete -W "$NG_COMMANDS" ng
+  NG_COMMANDS="add build config doc e2e generate help lint new run serve test update version xi18n"
+  complete -W "$NG_COMMANDS" ng
+fi

From 7fe7fc020e76968e8be6bb781db907060d818304 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Mon, 6 Apr 2020 10:16:11 -0700
Subject: [PATCH 159/388] aliases/git: Add alises fo git stash push/pop

---
 aliases/available/git.aliases.bash | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 270211ac..b9565eaf 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -82,10 +82,21 @@ alias gprom="git fetch origin master && git rebase origin/master && git update-r
 alias gpunch="git push --force-with-lease"
 alias ggui="git gui"
 alias gcsam="git commit -S -am"
+# Stash aliases
 alias gst="git stash"
 alias gstb="git stash branch"
 alias gstd="git stash drop"
 alias gstl="git stash list"
+# Push introduced in git v2.13.2
+alias gstpu="git stash push"
+alias gstpum="git stash push -m"
+# Save deprecated since git v2.16.0
+# - aliases now resolve to push
+alias gsts="git stash push"
+alias gstsm="git stash push -m"
+# Alias gstpo added for symmetry with gstpu (push)
+# - gstp remains as alias for pop due to long-standing usage
+alias gstpo="git stash pop"
 alias gstp="git stash pop"
 # Switch aliases - Requires git v2.23+
 alias gsw="git switch"

From 7a83c56d3a3dba8152e83af3ef5ec55b6cb4336a Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Tue, 7 Apr 2020 00:01:09 +0200
Subject: [PATCH 160/388] plugins/base: Detect HTTP errors in `myip()`

Out of the box, `curl` reports success (via exit code) even if the
server returns an error, e.g. _429 Too Many Requests_ which was
sometimes the case with `http://myip.dnsomatic.com`. So, errors went
undetected.

There is the `--fail` switch which enables us to use the exit code the
way we need:

> -f, --fail
>        (HTTP) Fail  silently  (no  output  at  all)  on  server
>        errors. This is mostly done to better enable scripts etc
>        to better deal with failed  attempts.  In  normal  cases
>        when  an  HTTP  server  fails  to deliver a document, it
>        returns an HTML document stating so  (which  often  also
>        describes  why  and  more).  This flag will prevent curl
>        from outputting that and return error 22.

Use it to make the `myip()` deliver results reliably.
---
 plugins/available/base.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/base.plugin.bash b/plugins/available/base.plugin.bash
index 297bf0ff..6da1384e 100755
--- a/plugins/available/base.plugin.bash
+++ b/plugins/available/base.plugin.bash
@@ -32,7 +32,7 @@ function myip ()
     list=("http://myip.dnsomatic.com/" "http://checkip.dyndns.com/" "http://checkip.dyndns.org/")
     for url in ${list[*]}
     do
-        res=$(curl -s "${url}")
+        res=$(curl -fs "${url}")
         if [ $? -eq 0 ];then
             break;
         fi

From b968ecac8057ecdd8adb55cccdc4ddb6f2547adf Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 8 Apr 2020 11:06:26 +0400
Subject: [PATCH 161/388] Update custom var naming

---
 themes/barbuk/barbuk.theme.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index fe687555..5c5fdf1d 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -12,8 +12,8 @@ SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
 EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
 
 # Ssh user and hostname display
-SSH_INFO=${BASH_IT_THEME_BARBUK_SSH_INFO:=true}
-HOST_INFO=${BASH_IT_THEME_BARBUK_HOST_INFO:=long}
+SSH_INFO=${BARBUK_SSH_INFO:=true}
+HOST_INFO=${BARBUK_HOST_INFO:=long}
 
 # Bash-it default glyphs customization
 SCM_NONE_CHAR=

From c4b8d4cf2e6f13dd13f1128f87d33b6157d990da Mon Sep 17 00:00:00 2001
From: BarbUk <julien.virey@gmail.com>
Date: Wed, 8 Apr 2020 11:06:44 +0400
Subject: [PATCH 162/388] Update documentation

---
 themes/barbuk/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index aebe20d4..87d23bad 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -45,16 +45,16 @@ source "$BASH_IT"/bash_it.sh
 ### Usage
 
 When using a ssh session, the theme will display `user@hostname`.
-You can disable this information with `BASH_IT_THEME_BARBUK_SSH_INFO`.
+You can disable this information with `BARBUK_SSH_INFO`.
 
 The hostname is displayed in the FQDN format by default. You
-can use the short hostname format with `BASH_IT_THEME_BARBUK_HOST_INFO`.
+can use the short hostname format with `BARBUK_HOST_INFO`.
 
 ```bash
 # short or long
-export BASH_IT_THEME_BARBUK_HOST_INFO=short
+export BARBUK_HOST_INFO=short
 # true or false
-export BASH_IT_THEME_BARBUK_SSH_INFO=false
+export BARBUK_SSH_INFO=false
 source "$BASH_IT"/bash_it.sh
 ```
 

From 668306cae71d97d9c07ae171929aa64ef1c4d022 Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Sun, 5 Apr 2020 21:27:46 +0200
Subject: [PATCH 163/388] test/plugins/base: Run `myip` test

Test of `myip` was skipped, allegedly for it being slow. It's fast for
me (~400 ms), so enable it unconditionally.
---
 test/plugins/base.plugin.bats | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index 3988831f..cca47497 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -16,10 +16,6 @@ load ../../plugins/available/base.plugin
 }
 
 @test 'plugins base: myip()' {
-  if [[ ! $SLOW_TESTS ]]; then
-    skip 'myip is slow - run only with SLOW_TESTS=true'
-  fi
-
   run myip
   assert_success
   declare -r mask_ip=$(echo $output | tr -s '[0-9]' '?')

From 3d45f01728497c2ac88d740b65837c1a823d950a Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Sun, 5 Apr 2020 13:17:10 +0200
Subject: [PATCH 164/388] test/test_helper: Don't use system/user `git` config

Git uses system-wide and user-wide configurations per default and these
can interfere with our tests. Keep `git` from using them by setting the
according environment variables.

This might also help with other tools which access user's home
directory.
---
 test/test_helper.bash | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/test_helper.bash b/test/test_helper.bash
index 9784cdf8..cd75f05a 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -17,6 +17,23 @@ fi
 export TEST_MAIN_DIR="${BATS_TEST_DIRNAME}/.."
 export TEST_DEPS_DIR="${TEST_DEPS_DIR-${TEST_MAIN_DIR}/../test_lib}"
 
+# be independent of git's system configuration
+export GIT_CONFIG_NOSYSTEM
+
+# Some tools, e.g. `git` use configuration files from the $HOME directory,
+# which interferes with our tests. The only way to keep `git` from doing this
+# seems to set HOME explicitly to a separate location.
+# Refer to https://git-scm.com/docs/git-config#FILES.
+unset XDG_CONFIG_HOME
+export HOME="${BATS_TMPDIR}/home"
+mkdir -p "${HOME}"
+
+# For `git` tests to run well, user name and email need to be set.
+# Refer to https://git-scm.com/docs/git-commit#_commit_information.
+# This goes to the test-specific config, due to the $HOME overridden above.
+git config --global user.name "John Doe"
+git config --global user.email "johndoe@example.com"
+
 load "${TEST_DEPS_DIR}/bats-support/load.bash"
 load "${TEST_DEPS_DIR}/bats-assert/load.bash"
 load "${TEST_DEPS_DIR}/bats-file/load.bash"

From f0af4fd6018d09aa73bf33e2e415d1d6e515a8cc Mon Sep 17 00:00:00 2001
From: Jeremy Mathevet <jeremy@mathevet.net>
Date: Thu, 9 Apr 2020 11:06:24 +0800
Subject: [PATCH 165/388] Check gh command exists before setting git gh alias

---
 aliases/available/git.aliases.bash | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index b9565eaf..cae55f21 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -103,7 +103,11 @@ alias gsw="git switch"
 alias gswm="git switch master"
 alias gswc="git switch --create"
 alias gswt="git switch --track"
-alias gh='cd "$(git rev-parse --show-toplevel)"'
+# Git home
+alias ghm='cd "$(git rev-parse --show-toplevel)"'
+if ! _command_exists gh; then
+  alias gh='cd "$(git rev-parse --show-toplevel)"'
+fi
 # Show untracked files
 alias gu='git ls-files . --exclude-standard --others'
 

From c003f0f34234db0a9f0119610a62c4cd7db6ef7e Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Thu, 9 Apr 2020 23:40:59 +0000
Subject: [PATCH 166/388] test/plugins/go: Skip tests in absence of `go`

In case `go` is not installed, tests of the according plugin fail. It's
better to just skip them since `golang` isn't commonly installed on
`bash-it` developers' machines.

In CI environment, no tests should be skipped, so run them anyway.
---
 test/plugins/go.plugin.bats | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/plugins/go.plugin.bats b/test/plugins/go.plugin.bats
index 02806205..d511bd24 100644
--- a/test/plugins/go.plugin.bats
+++ b/test/plugins/go.plugin.bats
@@ -5,12 +5,14 @@ load ../../lib/helpers
 load ../../lib/composure
 
 @test 'ensure _go_pathmunge_wrap is defined' {
+  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
   load ../../plugins/available/go.plugin
   run type -t _go_pathmunge_wrap
   assert_line 'function'
 }
 
 @test 'plugins go: single entry in GOPATH' {
+  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
   export GOPATH="/foo"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -18,6 +20,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: single entry in GOPATH, with space' {
+  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
   export GOPATH="/foo bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -25,6 +28,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: single entry in GOPATH, with escaped space' {
+  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
   export GOPATH="/foo\ bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -32,6 +36,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: multiple entries in GOPATH' {
+  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
   export GOPATH="/foo:/bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -39,6 +44,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: multiple entries in GOPATH, with space' {
+  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
   export GOPATH="/foo:/foo bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -46,6 +52,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: multiple entries in GOPATH, with escaped space' {
+  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
   export GOPATH="/foo:/foo\ bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin

From 5faeb6dc5c80946c31d046bd1d03782d0c8cdd58 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sat, 11 Apr 2020 16:27:17 -0500
Subject: [PATCH 167/388] add simple fasd plugin

---
 plugins/available/fasd.plugin.bash | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/available/fasd.plugin.bash

diff --git a/plugins/available/fasd.plugin.bash b/plugins/available/fasd.plugin.bash
new file mode 100644
index 00000000..0a1ae918
--- /dev/null
+++ b/plugins/available/fasd.plugin.bash
@@ -0,0 +1,4 @@
+cite about-plugin
+about-plugin 'load fasd, if you are using it'
+
+_command_exists fasd && eval $(fasd --init auto)

From de307f43cc47052da97d31a4565643a7d366b819 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Sun, 12 Apr 2020 11:19:35 -0500
Subject: [PATCH 168/388] fix uuid behavior for linux

---
 aliases/available/kubectl.aliases.bash |  2 +-
 aliases/available/uuidgen.aliases.bash | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/aliases/available/kubectl.aliases.bash b/aliases/available/kubectl.aliases.bash
index 0322c931..7022820f 100644
--- a/aliases/available/kubectl.aliases.bash
+++ b/aliases/available/kubectl.aliases.bash
@@ -18,7 +18,7 @@ function _set_pkg_aliases()
     alias kcdn='kubectl describe node'
     alias kcgpan='kubectl get pods --all-namespaces'
     alias kcgdan='kubectl get deployments --all-namespaces'
-    alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(uuidgen | tr A-Z a-z | sed 's/-//g') --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
+    alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(date +%s) --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
 	fi
 }
 
diff --git a/aliases/available/uuidgen.aliases.bash b/aliases/available/uuidgen.aliases.bash
index fec5a2b8..a427a4eb 100644
--- a/aliases/available/uuidgen.aliases.bash
+++ b/aliases/available/uuidgen.aliases.bash
@@ -1,6 +1,11 @@
-cite 'uuid-alias'
-about-alias 'uuidgen aliases'
+# cite 'uuid-alias'
+# about-alias 'uuidgen aliases'
 
-alias uuidu="uuidgen"
-alias uuidl="uuidgen | tr '[:upper:]' '[:lower:]'"
-alias uuid=uuidl # because upper case is like YELLING
+if [ "$(uuid 2>/dev/null)" != "" ]; then # Linux
+  alias uuidu="uuid | tr '[:lower:]' '[:upper:]'"
+  alias uuidl=uuid
+elif [ "$(uuidgen 2>/dev/null)" != "" ]; then # macOS/BSD
+  alias uuidu="uuidgen"
+  alias uuid="uuidgen | tr '[:upper:]' '[:lower:]'" # because upper case is like YELLING
+  alias uuidl=uuid
+fi

From b220c0e7441ab4e55c514b9d2348c103de0c4cd7 Mon Sep 17 00:00:00 2001
From: Uco Mesdag <uco.mesdag@allyourco.de>
Date: Mon, 13 Apr 2020 02:30:28 +0200
Subject: [PATCH 169/388] Plugin to toggle sudo before your current or last
 command

---
 plugins/available/sudo.plugin.bash | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/available/sudo.plugin.bash

diff --git a/plugins/available/sudo.plugin.bash b/plugins/available/sudo.plugin.bash
new file mode 100644
index 00000000..f18219b5
--- /dev/null
+++ b/plugins/available/sudo.plugin.bash
@@ -0,0 +1,15 @@
+cite about-plugin
+about-plugin 'Toggle sudo before your current or last command'
+
+function sudo-command-line() {
+  [[ ${#READLINE_LINE} -eq 0 ]] && READLINE_LINE=$(fc -l -n -1 | xargs)
+  if [[ $READLINE_LINE == sudo\ * ]]; then
+    READLINE_LINE="${READLINE_LINE#sudo }"
+  else
+    READLINE_LINE="sudo $READLINE_LINE"
+  fi
+  READLINE_POINT=${#READLINE_LINE}
+}
+
+# Define shortcut keys: [Esc] [Esc]
+bind -x '"\e\e": sudo-command-line'

From e73f6dbc620dfae27d186a98caa8f066df06ebe8 Mon Sep 17 00:00:00 2001
From: Uco Mesdag <uco.mesdag@allyourco.de>
Date: Mon, 13 Apr 2020 02:37:24 +0200
Subject: [PATCH 170/388] Reworded the about

---
 plugins/available/sudo.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/sudo.plugin.bash b/plugins/available/sudo.plugin.bash
index f18219b5..26c53853 100644
--- a/plugins/available/sudo.plugin.bash
+++ b/plugins/available/sudo.plugin.bash
@@ -1,5 +1,5 @@
 cite about-plugin
-about-plugin 'Toggle sudo before your current or last command'
+about-plugin 'Toggle sudo at the beginning of the current or the previous command'
 
 function sudo-command-line() {
   [[ ${#READLINE_LINE} -eq 0 ]] && READLINE_LINE=$(fc -l -n -1 | xargs)

From 860f9b83e62acb1a2da5f67fc81803287824df14 Mon Sep 17 00:00:00 2001
From: Wabri <gabriele.puliti@protonmail.com>
Date: Mon, 13 Apr 2020 12:48:29 +0200
Subject: [PATCH 171/388] Add (alias): create bashit to separate from general

Instead of put all together in one alias source, it's better to
create two different files and separate different features.
---
 aliases/available/bashit.aliases.bash | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 aliases/available/bashit.aliases.bash

diff --git a/aliases/available/bashit.aliases.bash b/aliases/available/bashit.aliases.bash
new file mode 100644
index 00000000..b11074be
--- /dev/null
+++ b/aliases/available/bashit.aliases.bash
@@ -0,0 +1,24 @@
+cite about-alias
+about-alias 'bashit aliases'
+
+# Common misspellings of bash-it
+alias shit='bash-it'
+alias batshit='bash-it'
+alias bashit='bash-it'
+alias batbsh='bash-it'
+alias babsh='bash-it'
+alias bash_it='bash-it'
+alias bash_ti='bash-it'
+
+# Additional bash-it aliases for help/show
+alias bshsa='bash-it show aliases'
+alias bshsc='bash-it show completions'
+alias bshsp='bash-it show plugins'
+alias bshha='bash-it help aliases'
+alias bshhc='bash-it help completions'
+alias bshhp='bash-it help plugins'
+alias bshsch="bash-it search"
+alias bshenp="bash-it enable plugin"
+alias bshena="bash-it enable alias"
+alias bshenc="bash-it enable completion"
+

From 74f053db9d0d9dfa307290dcd3b812e1f2793c75 Mon Sep 17 00:00:00 2001
From: Wabri <gabriele.puliti@protonmail.com>
Date: Mon, 13 Apr 2020 12:51:20 +0200
Subject: [PATCH 172/388] Remove (alias): bash_it alias is no more required in
 general

The bash_it alias are exported to the relative source, so is no more
required in the general alias.
---
 aliases/available/general.aliases.bash | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 542b76cd..1b35a1ab 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -75,27 +75,6 @@ fi
 alias md='mkdir -p'
 alias rd='rmdir'
 
-# Common misspellings of bash-it
-alias shit='bash-it'
-alias batshit='bash-it'
-alias bashit='bash-it'
-alias batbsh='bash-it'
-alias babsh='bash-it'
-alias bash_it='bash-it'
-alias bash_ti='bash-it'
-
-# Additional bash-it aliases for help/show
-alias bshsa='bash-it show aliases'
-alias bshsc='bash-it show completions'
-alias bshsp='bash-it show plugins'
-alias bshha='bash-it help aliases'
-alias bshhc='bash-it help completions'
-alias bshhp='bash-it help plugins'
-alias bshsch="bash-it search"
-alias bshenp="bash-it enable plugin"
-alias bshena="bash-it enable alias"
-alias bshenc="bash-it enable completion"
-
 # Shorten extract
 alias xt="extract"
 

From 023b4c3c3ba121ba00cff8f41c5358abc216211e Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 12:08:33 +0200
Subject: [PATCH 173/388] Migrated bats-support to bats-core project repo, 
 v0.3.0

---
 .gitmodules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 095a6a5e..f805758f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,8 @@
 	url = https://github.com/bats-core/bats-core
 [submodule "test_lib/bats-support"]
 	path = test_lib/bats-support
-	url = https://github.com/ztombol/bats-support
+	url = https://github.com/bats-core/bats-support
+	branch = tags/v0.3.0
 [submodule "test_lib/bats-assert"]
 	path = test_lib/bats-assert
 	url = https://github.com/ztombol/bats-assert

From 1dfaf47040f4d8a9a2448675fa3db60c2f5dd6ab Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 12:38:57 +0200
Subject: [PATCH 174/388] Updated bats-support library to v0.3.0 commit

---
 test_lib/bats-support | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_lib/bats-support b/test_lib/bats-support
index 004e7076..24a72e14 160000
--- a/test_lib/bats-support
+++ b/test_lib/bats-support
@@ -1 +1 @@
-Subproject commit 004e707638eedd62e0481e8cdc9223ad471f12ee
+Subproject commit 24a72e14349690bcbf7c151b9d2d1cdd32d36eb1

From 9f5f762869c07f583365297b4ee607900b4c27e4 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 12:42:18 +0200
Subject: [PATCH 175/388] Updated bats-assert to v2.0.0

---
 .gitmodules          | 3 ++-
 test_lib/bats-assert | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f805758f..34ffd55d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,7 +7,8 @@
 	branch = tags/v0.3.0
 [submodule "test_lib/bats-assert"]
 	path = test_lib/bats-assert
-	url = https://github.com/ztombol/bats-assert
+	url = https://github.com/bats-core/bats-assert
+	branch = tags/v2.0.0
 [submodule "test_lib/bats-file"]
 	path = test_lib/bats-file
 	url = https://github.com/ztombol/bats-file
diff --git a/test_lib/bats-assert b/test_lib/bats-assert
index 9f88b420..d750c5a1 160000
--- a/test_lib/bats-assert
+++ b/test_lib/bats-assert
@@ -1 +1 @@
-Subproject commit 9f88b4207da750093baabc4e3f41bf68f0dd3630
+Subproject commit d750c5a1b44bf6fc96726aea76f4621db5fd602f

From dfeb72d6aa5f3b72f5d8ccecaf2748b17d220e4e Mon Sep 17 00:00:00 2001
From: Uco Mesdag <uco.mesdag@allyourco.de>
Date: Mon, 13 Apr 2020 13:35:52 +0200
Subject: [PATCH 176/388] Added function metadata and bash version check

---
 plugins/available/sudo.plugin.bash | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/available/sudo.plugin.bash b/plugins/available/sudo.plugin.bash
index 26c53853..eb155daa 100644
--- a/plugins/available/sudo.plugin.bash
+++ b/plugins/available/sudo.plugin.bash
@@ -1,7 +1,10 @@
 cite about-plugin
-about-plugin 'Toggle sudo at the beginning of the current or the previous command'
+about-plugin 'Toggle sudo at the beginning of the current or the previous command by hitting the ESC key twice'
 
 function sudo-command-line() {
+  about "toggle sudo at the beginning of the current or the previous command by hitting the ESC key twice"
+  group "sudo"
+
   [[ ${#READLINE_LINE} -eq 0 ]] && READLINE_LINE=$(fc -l -n -1 | xargs)
   if [[ $READLINE_LINE == sudo\ * ]]; then
     READLINE_LINE="${READLINE_LINE#sudo }"
@@ -12,4 +15,8 @@ function sudo-command-line() {
 }
 
 # Define shortcut keys: [Esc] [Esc]
-bind -x '"\e\e": sudo-command-line'
+
+# Readline library requires bash version 4 or later
+if [ "${BASH_VERSINFO}" -ge 4 ]; then
+  bind -x '"\e\e": sudo-command-line'
+fi

From c6e76fe4ee4630e132008e4bbe85791b5b056888 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Mon, 13 Apr 2020 07:50:12 -0500
Subject: [PATCH 177/388] address review comments

---
 aliases/available/kubectl.aliases.bash | 10 +++++-----
 aliases/available/uuidgen.aliases.bash |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aliases/available/kubectl.aliases.bash b/aliases/available/kubectl.aliases.bash
index 7022820f..9ce923a0 100644
--- a/aliases/available/kubectl.aliases.bash
+++ b/aliases/available/kubectl.aliases.bash
@@ -5,12 +5,11 @@
 cite 'about-alias'
 about-alias 'kubectl aliases'
 
-# set apt aliases
 function _set_pkg_aliases()
 {
-	if [ -x $(which kubectl) ]; then
-		alias kc='kubectl'
-		alias kcgp='kubectl get pods'
+  if _command_exists kubectl; then
+    alias kc='kubectl'
+    alias kcgp='kubectl get pods'
     alias kcgd='kubectl get deployments'
     alias kcgn='kubectl get nodes'
     alias kcdp='kubectl describe pod'
@@ -18,8 +17,9 @@ function _set_pkg_aliases()
     alias kcdn='kubectl describe node'
     alias kcgpan='kubectl get pods --all-namespaces'
     alias kcgdan='kubectl get deployments --all-namespaces'
+    # launches a disposable netshoot pod in the k8s cluster
     alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(date +%s) --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
-	fi
+  fi
 }
 
 _set_pkg_aliases
diff --git a/aliases/available/uuidgen.aliases.bash b/aliases/available/uuidgen.aliases.bash
index a427a4eb..aada05fb 100644
--- a/aliases/available/uuidgen.aliases.bash
+++ b/aliases/available/uuidgen.aliases.bash
@@ -1,10 +1,10 @@
-# cite 'uuid-alias'
-# about-alias 'uuidgen aliases'
+cite 'uuid-alias'
+about-alias 'uuidgen aliases'
 
-if [ "$(uuid 2>/dev/null)" != "" ]; then # Linux
+if _command_exists uuid; then # Linux
   alias uuidu="uuid | tr '[:lower:]' '[:upper:]'"
   alias uuidl=uuid
-elif [ "$(uuidgen 2>/dev/null)" != "" ]; then # macOS/BSD
+elif _command_exists uuidgen; then # macOS/BSD
   alias uuidu="uuidgen"
   alias uuid="uuidgen | tr '[:upper:]' '[:lower:]'" # because upper case is like YELLING
   alias uuidl=uuid

From 9ccee2878cf0c3633318dddd95ca0bc5894a956a Mon Sep 17 00:00:00 2001
From: Wabri <gabriele.puliti@protonmail.com>
Date: Wed, 15 Apr 2020 09:18:13 +0200
Subject: [PATCH 178/388] Fix (aliases): source bash-it alias in general

This can let separate the bash-it alias from the system general one
---
 aliases/available/{bashit.aliases.bash => bash_it.aliases.bash} | 2 +-
 aliases/available/general.aliases.bash                          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename aliases/available/{bashit.aliases.bash => bash_it.aliases.bash} (95%)

diff --git a/aliases/available/bashit.aliases.bash b/aliases/available/bash_it.aliases.bash
similarity index 95%
rename from aliases/available/bashit.aliases.bash
rename to aliases/available/bash_it.aliases.bash
index b11074be..e26abd5a 100644
--- a/aliases/available/bashit.aliases.bash
+++ b/aliases/available/bash_it.aliases.bash
@@ -1,5 +1,5 @@
 cite about-alias
-about-alias 'bashit aliases'
+about-alias 'Bash-it aliases'
 
 # Common misspellings of bash-it
 alias shit='bash-it'
diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 1b35a1ab..2ab1c77a 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -92,3 +92,5 @@ catt() {
     fi
   done
 }
+
+source "$BASH_IT/aliases/available/bash-it.aliases.bash"

From 4b2a0513f2dd4e14b23f8e9c082ced44637681a4 Mon Sep 17 00:00:00 2001
From: Wabri <gabriele.puliti@protonmail.com>
Date: Thu, 16 Apr 2020 12:30:52 +0200
Subject: [PATCH 179/388] Update (alias): change the about-alias description

The bash-it alias description is now more clear
---
 .../available/{bash_it.aliases.bash => bash-it.aliases.bash}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename aliases/available/{bash_it.aliases.bash => bash-it.aliases.bash} (85%)

diff --git a/aliases/available/bash_it.aliases.bash b/aliases/available/bash-it.aliases.bash
similarity index 85%
rename from aliases/available/bash_it.aliases.bash
rename to aliases/available/bash-it.aliases.bash
index e26abd5a..2461e830 100644
--- a/aliases/available/bash_it.aliases.bash
+++ b/aliases/available/bash-it.aliases.bash
@@ -1,5 +1,5 @@
 cite about-alias
-about-alias 'Bash-it aliases'
+about-alias 'Aliases for the bash-it command (those aliases are also included with general aliases)'
 
 # Common misspellings of bash-it
 alias shit='bash-it'

From 0b9c37f5d1e5c4b78981d9e4db63fe55bfcaf338 Mon Sep 17 00:00:00 2001
From: Wabri <gabriele.puliti@protonmail.com>
Date: Thu, 16 Apr 2020 12:32:52 +0200
Subject: [PATCH 180/388] Add (alias): create a comment above the source of
 bash-it

To be more clear it was necessary to add a comment above source bash-it
to explain what is the pourpose of doing that.
---
 aliases/available/general.aliases.bash | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 2ab1c77a..d628e71d 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -93,4 +93,8 @@ catt() {
   done
 }
 
+# The bash-it aliases was move to bash-it.aliases.bash file. The intent of this
+# is to maintain the script readable and less bloated. If you don't need to use
+# those aliases, but you want the bash-it shortcuts, you can disable this 
+# script and enable the bash-it.
 source "$BASH_IT/aliases/available/bash-it.aliases.bash"

From 83fbfcf88a692fd3b578b7907f7b6f863a5d29ee Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Sat, 18 Apr 2020 18:39:29 +0200
Subject: [PATCH 181/388] travis: Remove obsolete `sudo`

`sudo` key is deprecated, refer to
https://docs.travis-ci.com/user/reference/overview/#deprecated-virtualization-environments.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b3fa2728..d10607db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 script: test/run
 language: c
 os:

From 44ddc583340abe8429d07438795539311eb70feb Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Sat, 18 Apr 2020 18:39:35 +0200
Subject: [PATCH 182/388] travis: Update language from `c` to `shell`

Be more precise as to what language is used; full list is found here:
https://config.travis-ci.com/ref/language.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d10607db..198a72c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 script: test/run
-language: c
+language: shell
 os:
   - linux
   - osx

From 576f2b37acf290ff44c034fd3c7f6fa3971e3b86 Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Sat, 18 Apr 2020 18:39:36 +0200
Subject: [PATCH 183/388] travis: Switch build matrix from `os` to `jobs`

There are a couple ways to declare a build matrix in Travis CI, refer to
https://docs.travis-ci.com/user/build-matrix.

Since upcoming commits will add more ways to run tests, switch the build
matrix from simple OS variation to a more powerful list of jobs.
---
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 198a72c0..a5d5806f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
-script: test/run
 language: shell
-os:
-  - linux
-  - osx
+
+jobs:
+  - script: test/run
+    os: linux
+  - script: test/run
+    os: osx

From b75b7697198b4eaa02c44d6290cb3f1aa1c046e1 Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Sat, 18 Apr 2020 18:43:10 +0200
Subject: [PATCH 184/388] travis: Refactor jobs to use inheritance

Since the existing jobs are similar (currently, the `script` keys are
same), move the equal parts to a new shared key to have them in one
place. The new map will receive more content in upcoming commits.
---
 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a5d5806f..a35f07a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,15 @@
+# YAML anchors need to appear first.
+# Keys starting with an underscore are the custom ones, refer to
+# https://docs.travis-ci.com/user/build-config-yaml#private-keys-as-yaml-anchors-and-aliases-and-external-tooling
+
+_native_job: &native_job
+  script: |
+    test/run
+
 language: shell
 
 jobs:
-  - script: test/run
+  - <<: *native_job
     os: linux
-  - script: test/run
+  - <<: *native_job
     os: osx

From f698261487f02ae6a6f51303a68a74e17ffaa460 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Sun, 19 Apr 2020 17:39:50 +0200
Subject: [PATCH 185/388] Updated to https://github.com/tralston/bats-file
 v0.3.0

---
 .gitmodules                   | 3 ++-
 test/plugins/base.plugin.bats | 2 +-
 test_lib/bats-file            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 34ffd55d..13532af5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,4 +11,5 @@
 	branch = tags/v2.0.0
 [submodule "test_lib/bats-file"]
 	path = test_lib/bats-file
-	url = https://github.com/ztombol/bats-file
+	url = https://github.com/tralston/bats-file
+  branch = tags/v0.3.0
diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index cca47497..731dc227 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -39,7 +39,7 @@ load ../../plugins/available/base.plugin
 
   mkcd "${dir_name}"
   assert_success
-  assert_file_exist "${BASH_IT_ROOT}/${dir_name}"
+  assert_dir_exist "${BASH_IT_ROOT}/${dir_name}"
   assert_equal $(pwd) "${BASH_IT_ROOT}/${dir_name}"
 }
 
diff --git a/test_lib/bats-file b/test_lib/bats-file
index 2fddb2b8..c128a1de 160000
--- a/test_lib/bats-file
+++ b/test_lib/bats-file
@@ -1 +1 @@
-Subproject commit 2fddb2b831d65cdf2e411f3b47f4677fbb15729c
+Subproject commit c128a1de53ba4a811835af410ce427f1049e2d7f

From 4ad790aa478ee8c7b7b36b11080e774cd13c3546 Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Mon, 20 Apr 2020 21:01:49 +0200
Subject: [PATCH 186/388] editorconfig: Add `.git*` section

Configuration files of `git` are managed by the tool and thus are
tab-indented. If a developer happens to edit such a file manually, the
indentation would become inconsistent.

Add an explicit section for such files and set the indentation to tabs.
---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 87e50155..e302645a 100755
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,6 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[.git*]
+indent_style = tab

From c53cc9f1433df5f52e58b0c47ca4d716d2159e34 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 12:58:44 +0200
Subject: [PATCH 187/388] Updated bats-core to latest version

---
 test_lib/bats-core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_lib/bats-core b/test_lib/bats-core
index 85388685..da4cefe3 160000
--- a/test_lib/bats-core
+++ b/test_lib/bats-core
@@ -1 +1 @@
-Subproject commit 85388685632f85d5a1c32e6bca2deec401964cf7
+Subproject commit da4cefe3010145d2eb699125a4b1efdff4409f3b

From 3093273425893b76c17a0b90dffe5d2c428bb67d Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 13:08:50 +0200
Subject: [PATCH 188/388] Updated rsync command to work with latest version of
 bats-core

---
 test/bash_it/bash_it.bats               | 2 +-
 test/completion/bash-it.completion.bats | 2 +-
 test/install/install.bats               | 2 +-
 test/install/uninstall.bats             | 2 +-
 test/lib/helpers.bats                   | 2 +-
 test/lib/search.bats                    | 2 +-
 test/lib/utilities.bats                 | 2 +-
 test/plugins/ruby.plugin.bats           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats
index 886453dd..721e8b99 100644
--- a/test/bash_it/bash_it.bats
+++ b/test/bash_it/bash_it.bats
@@ -10,7 +10,7 @@ function local_setup {
   echo "Lib: $lib_directory"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index f35b180b..e08ec55d 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -9,7 +9,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/install/install.bats b/test/install/install.bats
index 7e971d1f..7ee91a65 100644
--- a/test/install/install.bats
+++ b/test/install/install.bats
@@ -18,7 +18,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats
index d71ac06a..a65588df 100644
--- a/test/install/uninstall.bats
+++ b/test/install/uninstall.bats
@@ -18,7 +18,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index 6c4f706a..bb5846e8 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -15,7 +15,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/lib/search.bats b/test/lib/search.bats
index 5bbc8207..4bc8c6a2 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -22,7 +22,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/lib/utilities.bats b/test/lib/utilities.bats
index be21fa40..aeb74275 100644
--- a/test/lib/utilities.bats
+++ b/test/lib/utilities.bats
@@ -13,7 +13,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/plugins/ruby.plugin.bats b/test/plugins/ruby.plugin.bats
index ab11bda1..d42d0a13 100755
--- a/test/plugins/ruby.plugin.bats
+++ b/test/plugins/ruby.plugin.bats
@@ -10,7 +10,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled

From 34993f5da3230f5fe8658a70e9f0757491c7093c Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 20:20:33 +0200
Subject: [PATCH 189/388] Excluding enabled directory when setting up test
 fixtures

---
 test/bash_it/bash_it.bats               | 2 +-
 test/completion/bash-it.completion.bats | 2 +-
 test/install/install.bats               | 2 +-
 test/install/uninstall.bats             | 2 +-
 test/lib/helpers.bats                   | 2 +-
 test/lib/search.bats                    | 2 +-
 test/lib/utilities.bats                 | 2 +-
 test/plugins/ruby.plugin.bats           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats
index 721e8b99..95bad253 100644
--- a/test/bash_it/bash_it.bats
+++ b/test/bash_it/bash_it.bats
@@ -10,7 +10,7 @@ function local_setup {
   echo "Lib: $lib_directory"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index e08ec55d..9b111512 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -9,7 +9,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/install/install.bats b/test/install/install.bats
index 7ee91a65..2a754e42 100644
--- a/test/install/install.bats
+++ b/test/install/install.bats
@@ -18,7 +18,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats
index a65588df..315c8209 100644
--- a/test/install/uninstall.bats
+++ b/test/install/uninstall.bats
@@ -18,7 +18,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index bb5846e8..ef5ed182 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -15,7 +15,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/lib/search.bats b/test/lib/search.bats
index 4bc8c6a2..e7e8b4a8 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -22,7 +22,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/lib/utilities.bats b/test/lib/utilities.bats
index aeb74275..2bf415fb 100644
--- a/test/lib/utilities.bats
+++ b/test/lib/utilities.bats
@@ -13,7 +13,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled
diff --git a/test/plugins/ruby.plugin.bats b/test/plugins/ruby.plugin.bats
index d42d0a13..62d0e938 100755
--- a/test/plugins/ruby.plugin.bats
+++ b/test/plugins/ruby.plugin.bats
@@ -10,7 +10,7 @@ function local_setup {
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
   # Use rsync to copy Bash-it to the temp folder
   # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT"
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled

From 818a95d79ca42dd3496d3aa669f98d2e85c12d56 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 21:10:50 +0200
Subject: [PATCH 190/388] Refactored test setup code

Removed the copy/paste code, moved it into a reusable function that can
be called from the `local_setup` function as needed. Also simplified the
handling of the $HOME variable since @rico-chet provided a better way of
doing this.
---
 test/bash_it/bash_it.bats               | 28 +---------
 test/completion/bash-it.completion.bats | 31 +----------
 test/install/install.bats               | 26 +--------
 test/install/uninstall.bats             | 26 +--------
 test/lib/helpers.bats                   | 16 +-----
 test/lib/search.bats                    | 17 +-----
 test/lib/utilities.bats                 | 17 +-----
 test/plugins/ruby.plugin.bats           | 16 +-----
 test/test_helper.bash                   | 70 +++++++++++++++++--------
 9 files changed, 56 insertions(+), 191 deletions(-)

diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats
index 95bad253..af2f15e9 100644
--- a/test/bash_it/bash_it.bats
+++ b/test/bash_it/bash_it.bats
@@ -4,36 +4,10 @@ load ../test_helper
 load ../../lib/composure
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  echo "Bi : $BASH_IT"
-  echo "Lib: $lib_directory"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
+  setup_test_fixture
 
   # Copy the test fixture to the Bash-it folder
   rsync -a "$BASH_IT/test/fixtures/bash_it/" "$BASH_IT/"
-
-  # Don't pollute the user's actual $HOME directory
-  # Use a test home directory instead
-  export BASH_IT_TEST_CURRENT_HOME="${HOME}"
-  export BASH_IT_TEST_HOME="$(cd "${BASH_IT}/.." && pwd)/BASH_IT_TEST_HOME"
-  mkdir -p "${BASH_IT_TEST_HOME}"
-  export HOME="${BASH_IT_TEST_HOME}"
-}
-
-function local_teardown {
-  export HOME="${BASH_IT_TEST_CURRENT_HOME}"
-
-  rm -rf "${BASH_IT_TEST_HOME}"
-
-  assert_equal "${BASH_IT_TEST_CURRENT_HOME}" "${HOME}"
 }
 
 @test "bash-it: verify that the test fixture is available" {
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index 9b111512..87c697e4 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -5,36 +5,7 @@ load ../../lib/composure
 load ../../completion/available/bash-it.completion
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
-
-  mkdir -p "$BASH_IT"/enabled
-  mkdir -p "$BASH_IT"/aliases/enabled
-  mkdir -p "$BASH_IT"/completion/enabled
-  mkdir -p "$BASH_IT"/plugins/enabled
-
-  # Don't pollute the user's actual $HOME directory
-  # Use a test home directory instead
-  export BASH_IT_TEST_CURRENT_HOME="${HOME}"
-  export BASH_IT_TEST_HOME="$(cd "${BASH_IT}/.." && pwd)/BASH_IT_TEST_HOME"
-  mkdir -p "${BASH_IT_TEST_HOME}"
-  export HOME="${BASH_IT_TEST_HOME}"
-}
-
-function local_teardown {
-  export HOME="${BASH_IT_TEST_CURRENT_HOME}"
-
-  rm -rf "${BASH_IT_TEST_HOME}"
-
-  assert_equal "${BASH_IT_TEST_CURRENT_HOME}" "${HOME}"
+  setup_test_fixture
 }
 
 @test "completion bash-it: ensure that the _bash-it-comp function is available" {
diff --git a/test/install/install.bats b/test/install/install.bats
index 2a754e42..01776f25 100644
--- a/test/install/install.bats
+++ b/test/install/install.bats
@@ -14,31 +14,7 @@ case $OSTYPE in
 esac
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
-
-  # Don't pollute the user's actual $HOME directory
-  # Use a test home directory instead
-  export BASH_IT_TEST_CURRENT_HOME="${HOME}"
-  export BASH_IT_TEST_HOME="$(cd "${BASH_IT}/.." && pwd)/BASH_IT_TEST_HOME"
-  mkdir -p "${BASH_IT_TEST_HOME}"
-  export HOME="${BASH_IT_TEST_HOME}"
-}
-
-function local_teardown {
-  export HOME="${BASH_IT_TEST_CURRENT_HOME}"
-
-  rm -rf "${BASH_IT_TEST_HOME}"
-
-  assert_equal "${BASH_IT_TEST_CURRENT_HOME}" "${HOME}"
+  setup_test_fixture
 }
 
 @test "install: verify that the install script exists" {
diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats
index 315c8209..b2439b9d 100644
--- a/test/install/uninstall.bats
+++ b/test/install/uninstall.bats
@@ -14,31 +14,7 @@ case $OSTYPE in
 esac
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
-
-  # Don't pollute the user's actual $HOME directory
-  # Use a test home directory instead
-  export BASH_IT_TEST_CURRENT_HOME="${HOME}"
-  export BASH_IT_TEST_HOME="$(cd "${BASH_IT}/.." && pwd)/BASH_IT_TEST_HOME"
-  mkdir -p "${BASH_IT_TEST_HOME}"
-  export HOME="${BASH_IT_TEST_HOME}"
-}
-
-function local_teardown {
-  export HOME="${BASH_IT_TEST_CURRENT_HOME}"
-
-  rm -rf "${BASH_IT_TEST_HOME}"
-
-  assert_equal "${BASH_IT_TEST_CURRENT_HOME}" "${HOME}"
+  setup_test_fixture
 }
 
 @test "uninstall: verify that the uninstall script exists" {
diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index ef5ed182..c3f905e7 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -11,21 +11,7 @@ cite _about _param _example _group _author _version
 load ../../lib/helpers
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
-
-  mkdir -p "$BASH_IT"/enabled
-  mkdir -p "$BASH_IT"/aliases/enabled
-  mkdir -p "$BASH_IT"/completion/enabled
-  mkdir -p "$BASH_IT"/plugins/enabled
+  setup_test_fixture
 }
 
 # TODO Create global __is_enabled function
diff --git a/test/lib/search.bats b/test/lib/search.bats
index e7e8b4a8..da448acc 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -18,22 +18,7 @@ cite _about _param _example _group _author _version
 load ../../lib/helpers
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
-  rm -rf "$BASH_IT"/tmp/cache
-
-  mkdir -p "$BASH_IT"/enabled
-  mkdir -p "$BASH_IT"/aliases/enabled
-  mkdir -p "$BASH_IT"/completion/enabled
-  mkdir -p "$BASH_IT"/plugins/enabled
+  setup_test_fixture
 
   export OLD_PATH="$PATH"
   export PATH="/usr/bin:/bin:/usr/sbin"
diff --git a/test/lib/utilities.bats b/test/lib/utilities.bats
index 2bf415fb..6e0f4ac7 100644
--- a/test/lib/utilities.bats
+++ b/test/lib/utilities.bats
@@ -9,22 +9,7 @@ load ../../lib/search
 cite _about _param _example _group _author _version
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
-  rm -rf "$BASH_IT"/tmp/cache
-
-  mkdir -p "$BASH_IT"/enabled
-  mkdir -p "$BASH_IT"/aliases/enabled
-  mkdir -p "$BASH_IT"/completion/enabled
-  mkdir -p "$BASH_IT"/plugins/enabled
+  setup_test_fixture
 }
 
 function has_match() {
diff --git a/test/plugins/ruby.plugin.bats b/test/plugins/ruby.plugin.bats
index 62d0e938..a45411e2 100755
--- a/test/plugins/ruby.plugin.bats
+++ b/test/plugins/ruby.plugin.bats
@@ -6,21 +6,7 @@ load ../../lib/composure
 load ../../plugins/available/ruby.plugin
 
 function local_setup {
-  mkdir -p "$BASH_IT"
-  lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
-
-  rm -rf "$BASH_IT"/enabled
-  rm -rf "$BASH_IT"/aliases/enabled
-  rm -rf "$BASH_IT"/completion/enabled
-  rm -rf "$BASH_IT"/plugins/enabled
-
-  mkdir -p "$BASH_IT"/enabled
-  mkdir -p "$BASH_IT"/aliases/enabled
-  mkdir -p "$BASH_IT"/completion/enabled
-  mkdir -p "$BASH_IT"/plugins/enabled
+  setup_test_fixture
 
   export OLD_PATH="$PATH"
   export PATH="/usr/bin:/bin:/usr/sbin"
diff --git a/test/test_helper.bash b/test/test_helper.bash
index cd75f05a..c51e2b53 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -6,34 +6,12 @@ unset TODO
 unset SCM_CHECK
 unset BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE
 
-BASH_IT_TEST_DIR="${BATS_TMPDIR}/.bash_it"
-
-# guard against executing this block twice due to bats internals
-if [ "$BASH_IT_ROOT" != "${BASH_IT_TEST_DIR}/root" ]; then
-  export BASH_IT_ROOT="${BASH_IT_TEST_DIR}/root"
-  export BASH_IT=$BASH_IT_TEST_DIR
-fi
-
 export TEST_MAIN_DIR="${BATS_TEST_DIRNAME}/.."
 export TEST_DEPS_DIR="${TEST_DEPS_DIR-${TEST_MAIN_DIR}/../test_lib}"
 
 # be independent of git's system configuration
 export GIT_CONFIG_NOSYSTEM
 
-# Some tools, e.g. `git` use configuration files from the $HOME directory,
-# which interferes with our tests. The only way to keep `git` from doing this
-# seems to set HOME explicitly to a separate location.
-# Refer to https://git-scm.com/docs/git-config#FILES.
-unset XDG_CONFIG_HOME
-export HOME="${BATS_TMPDIR}/home"
-mkdir -p "${HOME}"
-
-# For `git` tests to run well, user name and email need to be set.
-# Refer to https://git-scm.com/docs/git-commit#_commit_information.
-# This goes to the test-specific config, due to the $HOME overridden above.
-git config --global user.name "John Doe"
-git config --global user.email "johndoe@example.com"
-
 load "${TEST_DEPS_DIR}/bats-support/load.bash"
 load "${TEST_DEPS_DIR}/bats-assert/load.bash"
 load "${TEST_DEPS_DIR}/bats-file/load.bash"
@@ -46,9 +24,56 @@ local_teardown() {
   true
 }
 
+# This function sets up a local test fixture, i.e. a completely
+# fresh and isolated Bash-it directory. This is done to avoid
+# messing with your own Bash-it source directory.
+# If you need this, call it in your .bats file's `local_setup` function.
+setup_test_fixture() {
+  mkdir -p "$BASH_IT"
+  lib_directory="$(cd "$(dirname "$0")" && pwd)"
+  # Use rsync to copy Bash-it to the temp folder
+  # rsync is faster than cp, since we can exclude the large ".git" folder
+  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
+
+  rm -rf "$BASH_IT"/enabled
+  rm -rf "$BASH_IT"/aliases/enabled
+  rm -rf "$BASH_IT"/completion/enabled
+  rm -rf "$BASH_IT"/plugins/enabled
+
+  mkdir -p "$BASH_IT"/enabled
+  mkdir -p "$BASH_IT"/aliases/enabled
+  mkdir -p "$BASH_IT"/completion/enabled
+  mkdir -p "$BASH_IT"/plugins/enabled
+
+  # Some tests use the BASH_IT_TEST_HOME variable, e.g. install/uninstall
+  export BASH_IT_TEST_HOME="$TEST_TEMP_DIR"
+}
+
 setup() {
+  TEST_TEMP_DIR="$(mktemp -d -t 'bash-it-test')"
+  export TEST_TEMP_DIR
+
+  export BASH_IT_TEST_DIR="${TEST_TEMP_DIR}/.bash_it"
+
+  export BASH_IT_ROOT="${BASH_IT_TEST_DIR}/root"
+  export BASH_IT=$BASH_IT_TEST_DIR
+
   mkdir -p -- "${BASH_IT_ROOT}"
 
+  # Some tools, e.g. `git` use configuration files from the $HOME directory,
+  # which interferes with our tests. The only way to keep `git` from doing this
+  # seems to set HOME explicitly to a separate location.
+  # Refer to https://git-scm.com/docs/git-config#FILES.
+  unset XDG_CONFIG_HOME
+  export HOME="${TEST_TEMP_DIR}"
+  mkdir -p "${HOME}"
+
+  # For `git` tests to run well, user name and email need to be set.
+  # Refer to https://git-scm.com/docs/git-commit#_commit_information.
+  # This goes to the test-specific config, due to the $HOME overridden above.
+  git config --global user.name "John Doe"
+  git config --global user.email "johndoe@example.com"
+
   local_setup
 }
 
@@ -56,6 +81,7 @@ teardown() {
   local_teardown
 
   rm -rf "${BASH_IT_TEST_DIR}"
+  temp_del "${TEST_TEMP_DIR}"
 }
 
 # Fail and display path of the link if it does not exist. Also fails

From bc433cd9999cce63bb69ff03e941836a1521a2cd Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 21:29:18 +0200
Subject: [PATCH 191/388] Fixing the mktemp function on Linux

---
 test/test_helper.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/test_helper.bash b/test/test_helper.bash
index c51e2b53..ece4bd92 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -50,7 +50,9 @@ setup_test_fixture() {
 }
 
 setup() {
-  TEST_TEMP_DIR="$(mktemp -d -t 'bash-it-test')"
+  # Temporarily using `mktemp` directly, since the bats-file function
+  # `temp_make` does not run on macOS
+  TEST_TEMP_DIR="$(mktemp -d -t 'bash-it-test.XXXX')"
   export TEST_TEMP_DIR
 
   export BASH_IT_TEST_DIR="${TEST_TEMP_DIR}/.bash_it"

From eb6469096af8d114e53b17b609ecb63e3eba96db Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 13 Apr 2020 21:53:10 +0200
Subject: [PATCH 192/388] Added the parallel test execution code from
 @rico-chet

See here: https://github.com/rico-chet/bash-it/blob/cd4a039215ae1f1495d72f5a1cbff504f5598efe/test/run#L22
---
 test/run | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/test/run b/test/run
index da1aa061..cf71259b 100755
--- a/test/run
+++ b/test/run
@@ -16,4 +16,26 @@ else
   test_dirs=( "$1" )
 fi
 
-exec $bats_executable ${CI:+--tap} "${test_dirs[@]}"
+if command -v parallel &> /dev/null
+then
+  # Expect to run at least on a dual-core CPU; slightly degraded performance
+  # shouldn't matter otherwise.
+  declare -i -r test_jobs_default=2
+  declare -i -r test_jobs_effective="$(
+    if [ "${TEST_JOBS:-detect}" = "detect" ] \
+      && command -v nproc &> /dev/null
+    then
+      nproc
+    elif [ -n "${TEST_JOBS}" ] \
+      && [ "${TEST_JOBS}" != "detect" ]
+    then
+      echo "${TEST_JOBS}"
+    else
+      echo ${test_jobs_default}
+    fi
+  )"
+  exec "$bats_executable" ${CI:+--tap} --jobs ${test_jobs_effective} \
+    "${test_dirs[@]}"
+else
+  exec "$bats_executable" ${CI:+--tap} "${test_dirs[@]}"
+fi

From 9269c4445dba8e396dd6a91cb7d346185e8ca4ad Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 20 Apr 2020 08:53:28 +0200
Subject: [PATCH 193/388] Went back to the bats-file temp_make function

Switching to tralston/bats-file allowed to use temp_make on macOS.
---
 test/test_helper.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_helper.bash b/test/test_helper.bash
index ece4bd92..ef46cc4e 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -50,9 +50,9 @@ setup_test_fixture() {
 }
 
 setup() {
-  # Temporarily using `mktemp` directly, since the bats-file function
-  # `temp_make` does not run on macOS
-  TEST_TEMP_DIR="$(mktemp -d -t 'bash-it-test.XXXX')"
+  # The `temp_make` function from "bats-file" requires the tralston/bats-file fork,
+  # since the original ztombol/bats-file's `temp_make` does not work on macOS.
+  TEST_TEMP_DIR="$(temp_make --prefix 'bash-it-test-')"
   export TEST_TEMP_DIR
 
   export BASH_IT_TEST_DIR="${TEST_TEMP_DIR}/.bash_it"

From 543e49b759fcec4d0283ca56bf8462499fba083a Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 20 Apr 2020 08:59:06 +0200
Subject: [PATCH 194/388] Updated GNU parallel detection

Thanks to @rico-chet for the detection code!
---
 test/run | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/run b/test/run
index cf71259b..88202916 100755
--- a/test/run
+++ b/test/run
@@ -16,7 +16,13 @@ else
   test_dirs=( "$1" )
 fi
 
-if command -v parallel &> /dev/null
+# Make sure that the `parallel` command is installed,
+# AND that it is the GNU version of `parallel`.
+# If that is the case, try to guess the number of CPU cores,
+# so we can run `bats` in parallel processing mode, which is a lot faster.
+if command -v parallel &> /dev/null \
+  && parallel -V &> /dev/null \
+  && { parallel -V 2> /dev/null | grep -q '^GNU\>'; }
 then
   # Expect to run at least on a dual-core CPU; slightly degraded performance
   # shouldn't matter otherwise.
@@ -37,5 +43,6 @@ then
   exec "$bats_executable" ${CI:+--tap} --jobs ${test_jobs_effective} \
     "${test_dirs[@]}"
 else
+  # Run `bats` in single-threaded mode.
   exec "$bats_executable" ${CI:+--tap} "${test_dirs[@]}"
 fi

From d6e559f4247e57ab43431e00ffa84cbb2401243e Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 21 Apr 2020 08:22:51 +0200
Subject: [PATCH 195/388] Fixed indentation

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 13532af5..c337c96c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,4 +12,4 @@
 [submodule "test_lib/bats-file"]
 	path = test_lib/bats-file
 	url = https://github.com/tralston/bats-file
-  branch = tags/v0.3.0
+	branch = tags/v0.3.0

From 06cc400229ac0e748490c1eba9d0812244fb9d44 Mon Sep 17 00:00:00 2001
From: All Your Code <ucomesdag@users.noreply.github.com>
Date: Tue, 21 Apr 2020 08:30:26 +0200
Subject: [PATCH 196/388] Added OC completion (#1567)

* Added OC completion

* Instead of copy pasting the output, using the output directly

* Replaced which command with _command_exists
---
 completion/available/oc.completion.bash | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 completion/available/oc.completion.bash

diff --git a/completion/available/oc.completion.bash b/completion/available/oc.completion.bash
new file mode 100644
index 00000000..1e7b6815
--- /dev/null
+++ b/completion/available/oc.completion.bash
@@ -0,0 +1 @@
+_command_exists oc && source <(oc completion bash)

From 313e9bd51bdda8b127c7163276e3e1e4ab52efad Mon Sep 17 00:00:00 2001
From: All Your Code <ucomesdag@users.noreply.github.com>
Date: Tue, 21 Apr 2020 08:32:20 +0200
Subject: [PATCH 197/388] Added Minishift completion (#1566)

* Added Minishift completion

* Instead of copy pasting the output, using the output directly

* Replaced which command with _command_exists
---
 completion/available/minishift.completion.bash | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 completion/available/minishift.completion.bash

diff --git a/completion/available/minishift.completion.bash b/completion/available/minishift.completion.bash
new file mode 100644
index 00000000..5679eae8
--- /dev/null
+++ b/completion/available/minishift.completion.bash
@@ -0,0 +1 @@
+_command_exists minishift && source <(minishift completion bash)

From 862b99896daefa715d7ef4e658121dd5a6440c1b Mon Sep 17 00:00:00 2001
From: Uco Mesdag <uco.mesdag@allyourco.de>
Date: Tue, 21 Apr 2020 15:00:14 +0200
Subject: [PATCH 198/388] Updated openshift completion to use _command_exists
 and removed duplicate oc completion

---
 completion/available/oc.completion.bash        | 1 -
 completion/available/openshift.completion.bash | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 completion/available/oc.completion.bash

diff --git a/completion/available/oc.completion.bash b/completion/available/oc.completion.bash
deleted file mode 100644
index 1e7b6815..00000000
--- a/completion/available/oc.completion.bash
+++ /dev/null
@@ -1 +0,0 @@
-_command_exists oc && source <(oc completion bash)
diff --git a/completion/available/openshift.completion.bash b/completion/available/openshift.completion.bash
index 8e7a4633..1e7b6815 100644
--- a/completion/available/openshift.completion.bash
+++ b/completion/available/openshift.completion.bash
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
-[ -x "$(which oc)" ] && eval "$(oc completion bash)" 
+_command_exists oc && source <(oc completion bash)

From ce160ff314d5bbd6cbe9f07c0a1acfb073ab92b2 Mon Sep 17 00:00:00 2001
From: Ralph Gutmann <ralph.gutmann@t-systems.com>
Date: Tue, 21 Apr 2020 18:11:15 +0200
Subject: [PATCH 199/388] added tar extract-directory creation and usage (also
 removal of unnecessary recursion where appropriate)

---
 plugins/available/extract.plugin.bash | 40 ++++++++++++++++++---------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/plugins/available/extract.plugin.bash b/plugins/available/extract.plugin.bash
index e357814a..d431e711 100644
--- a/plugins/available/extract.plugin.bash
+++ b/plugins/available/extract.plugin.bash
@@ -5,7 +5,7 @@ about-plugin 'one command to extract them all...'
 extract() {
     local opt
     local OPTIND=1
-    while getopts "hv" opt; do
+    while getopts "hdv" opt; do
         case "$opt" in
             h)
                 cat <<End-Of-Usage
@@ -29,12 +29,28 @@ End-Of-Usage
 
     [ $# -eq 0 ] && extract -h && return 1
     while [ $# -gt 0 ]; do
-	    if [ -f "$1" ]; then
-		    case "$1" in
-                *.tar.bz2|*.tbz|*.tbz2) tar "x${verbose}jf" "$1" ;;
-                *.tar.gz|*.tgz) tar "x${verbose}zf" "$1" ;;
-                *.tar.xz) xz --decompress "$1"; set -- "$@" "${1:0:-3}" ;;
-                *.tar.Z) uncompress "$1"; set -- "$@" "${1:0:-2}" ;;
+        if [[ ! -f "$1" ]]; then
+            echo "extract: '$1' is not a valid file" >&2
+            shift
+            continue
+        fi
+
+        local -r filename=$(basename -- $1)
+        local -r filedirname=$(dirname -- $1)
+        local targetdirname=$(sed 's/\(\.tar\.bz2$\|\.tbz$\|\.tbz2$\|\.tar\.gz$\|\.tgz$\|\.tar$\|\.tar\.xz$\|\.txz$\|\.tar\.Z$\|\.7z$\)//g' <<< $filename)
+        if [ "$filename" = "$targetdirname" ]; then
+            # archive type either not supported or it doesn't need dir creation
+            targetdirname=""
+        else
+            mkdir -v "$filedirname/$targetdirname"
+        fi
+
+        if [ -f "$1" ]; then
+            case "$1" in
+                *.tar.bz2|*.tbz|*.tbz2) tar "x${verbose}jf" "$1" -C "$filedirname/$targetdirname" ;;
+                *.tar.gz|*.tgz) tar "x${verbose}zf" "$1" -C "$filedirname/$targetdirname" ;;
+                *.tar.xz|*.txz) tar "x${verbose}Jf" "$1" -C "$filedirname/$targetdirname" ;;
+                *.tar.Z) tar "x${verbose}Zf" "$1" -C "$filedirname/$targetdirname" ;;
                 *.bz2) bunzip2 "$1" ;;
                 *.deb) dpkg-deb -x${verbose} "$1" "${1:0:-4}" ;;
                 *.pax.gz) gunzip "$1"; set -- "$@" "${1:0:-3}" ;;
@@ -43,17 +59,15 @@ End-Of-Usage
                 *.pkg) pkgutil --expand "$1" "${1:0:-4}" ;;
                 *.rar) unrar x "$1" ;;
                 *.rpm) rpm2cpio "$1" | cpio -idm${verbose} ;;
-                *.tar) tar "x${verbose}f" "$1" ;;
-                *.txz) mv "$1" "${1:0:-4}.tar.xz"; set -- "$@" "${1:0:-4}.tar.xz" ;;
+                *.tar) tar "x${verbose}f" "$1" -C "$filedirname/$targetdirname" ;;
                 *.xz) xz --decompress "$1" ;;
                 *.zip|*.war|*.jar) unzip "$1" ;;
                 *.Z) uncompress "$1" ;;
                 *.7z) 7za x "$1" ;;
                 *) echo "'$1' cannot be extracted via extract" >&2;;
-		    esac
-        else
-		    echo "extract: '$1' is not a valid file" >&2
-	    fi
+            esac
+        fi
+
         shift
     done
 }

From 306be4dd4f4622ab92f8f70c2f1dc00ed42de91b Mon Sep 17 00:00:00 2001
From: Ralph Gutmann <ralph.gutmann@t-systems.com>
Date: Tue, 21 Apr 2020 18:34:28 +0200
Subject: [PATCH 200/388] (minor) options fix

---
 plugins/available/extract.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/extract.plugin.bash b/plugins/available/extract.plugin.bash
index d431e711..719808e5 100644
--- a/plugins/available/extract.plugin.bash
+++ b/plugins/available/extract.plugin.bash
@@ -5,7 +5,7 @@ about-plugin 'one command to extract them all...'
 extract() {
     local opt
     local OPTIND=1
-    while getopts "hdv" opt; do
+    while getopts "hv" opt; do
         case "$opt" in
             h)
                 cat <<End-Of-Usage

From f8a1877c72cc2970400ae3017cb3da8149f43891 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 21 Apr 2020 11:25:37 -0700
Subject: [PATCH 201/388] completion/git: Updates completion script to v2.26.2

---
 completion/available/git.completion.bash | 585 ++++++++++++++++++-----
 1 file changed, 458 insertions(+), 127 deletions(-)

diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash
index 1e3fdcac..3f75364e 100644
--- a/completion/available/git.completion.bash
+++ b/completion/available/git.completion.bash
@@ -1,3 +1,8 @@
+# git bash completions v2.26.2
+# Completion file copied as-is from git contrib:
+# - https://github.com/git/git/releases/tag/v2.26.2
+# - git-2.26.2/contrib/completion/git-completion.bash
+# -------------------------------------------------------------------
 # bash/zsh completion support for core Git.
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
@@ -37,7 +42,8 @@
 #   GIT_COMPLETION_CHECKOUT_NO_GUESS
 #
 #     When set to "1", do not include "DWIM" suggestions in git-checkout
-#     completion (e.g., completing "foo" when "origin/foo" exists).
+#     and git-switch completion (e.g., completing "foo" when "origin/foo"
+#     exists).
 
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;
@@ -339,7 +345,7 @@ __gitcomp ()
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
-				--*=*|*.) ;;
+				--*=|*.) ;;
 				*) c="$c " ;;
 				esac
 				COMPREPLY[i++]="${2-}$c"
@@ -359,7 +365,7 @@ __gitcomp ()
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
-				--*=*|*.) ;;
+				*=|*.) ;;
 				*) c="$c " ;;
 				esac
 				COMPREPLY[i++]="${2-}$c"
@@ -400,7 +406,8 @@ __gitcomp_builtin ()
 	if [ -z "$options" ]; then
 		# leading and trailing spaces are significant to make
 		# option removal work correctly.
-		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) "
+		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return
+
 		for i in $excl; do
 			options="${options/ $i / }"
 		done
@@ -522,7 +529,7 @@ __git_index_files ()
 			# Even when a directory name itself does not contain
 			# any special characters, it will still be quoted if
 			# any of its (stripped) trailing path components do.
-			# Because of this we may have seen the same direcory
+			# Because of this we may have seen the same directory
 			# both quoted and unquoted.
 			if (p in paths)
 				# We have seen the same directory unquoted,
@@ -548,7 +555,7 @@ __git_index_files ()
 						 esc_idx, 1)
 			} else if (esc == "n") {
 				# Uh-oh, a newline character.
-				# We cant reliably put a pathname
+				# We cannot reliably put a pathname
 				# containing a newline into COMPREPLY,
 				# and the newline would create a mess.
 				# Skip this path.
@@ -563,7 +570,7 @@ __git_index_files ()
 			}
 		}
 		# Drop closing double quote, if there is one.
-		# (There isnt any if this is a directory, as it was
+		# (There is not any if this is a directory, as it was
 		# already stripped with the trailing path components.)
 		if (substr(p, length(p), 1) == "\"")
 			out = out substr(p, 1, length(p) - 1)
@@ -853,6 +860,11 @@ __git_compute_merge_strategies ()
 	__git_merge_strategies=$(__git_list_merge_strategies)
 }
 
+__git_merge_strategy_options="ours theirs subtree subtree= patience
+	histogram diff-algorithm= ignore-space-change ignore-all-space
+	ignore-space-at-eol renormalize no-renormalize no-renames
+	find-renames find-renames= rename-threshold="
+
 __git_complete_revlist_file ()
 {
 	local dequoted_word pfx ls ref cur_="$cur"
@@ -996,12 +1008,21 @@ __git_complete_strategy ()
 	-s|--strategy)
 		__gitcomp "$__git_merge_strategies"
 		return 0
+		;;
+	-X)
+		__gitcomp "$__git_merge_strategy_options"
+		return 0
+		;;
 	esac
 	case "$cur" in
 	--strategy=*)
 		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
 		return 0
 		;;
+	--strategy-option=*)
+		__gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+		return 0
+		;;
 	esac
 	return 1
 }
@@ -1010,7 +1031,7 @@ __git_all_commands=
 __git_compute_all_commands ()
 {
 	test -n "$__git_all_commands" ||
-	__git_all_commands=$(git --list-cmds=main,others,alias,nohelpers)
+	__git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
 }
 
 # Lists all set config variables starting with the given section prefix,
@@ -1053,15 +1074,32 @@ __git_aliased_command ()
 	done
 }
 
-# __git_find_on_cmdline requires 1 argument
+# Check whether one of the given words is present on the command line,
+# and print the first word found.
+#
+# Usage: __git_find_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
 __git_find_on_cmdline ()
 {
-	local word subcommand c=1
+	local word c=1 show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
 	while [ $c -lt $cword ]; do
-		word="${words[c]}"
-		for subcommand in $1; do
-			if [ "$subcommand" = "$word" ]; then
-				echo "$subcommand"
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "$show_idx" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
 				return
 			fi
 		done
@@ -1163,6 +1201,8 @@ __git_count_arguments ()
 }
 
 __git_whitespacelist="nowarn warn error error-all fix"
+__git_patchformat="mbox stgit stgit-series hg mboxrd"
+__git_showcurrentpatch="diff raw"
 __git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
@@ -1177,6 +1217,14 @@ _git_am ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--patch-format=*)
+		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
+		return
+		;;
+	--show-current-patch=*)
+		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin am "" \
 			"$__git_am_inprogress_options"
@@ -1200,6 +1248,10 @@ _git_apply ()
 _git_add ()
 {
 	case "$cur" in
+	--chmod=*)
+		__gitcomp "+x -x" "" "${cur##--chmod=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin add
 		return
@@ -1225,10 +1277,7 @@ _git_archive ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--format= --list --verbose
-			--prefix= --remote= --exec= --output
-			"
+		__gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes"
 		return
 		;;
 	esac
@@ -1260,6 +1309,8 @@ _git_bisect ()
 	esac
 }
 
+__git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD symref"
+
 _git_branch ()
 {
 	local i c=1 only_local_ref="n" has_r="n"
@@ -1334,7 +1385,9 @@ _git_checkout ()
 	esac
 }
 
-__git_cherry_pick_inprogress_options="--continue --quit --abort"
+__git_sequencer_inprogress_options="--continue --quit --abort --skip"
+
+__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
 
 _git_cherry_pick ()
 {
@@ -1343,6 +1396,9 @@ _git_cherry_pick ()
 		__gitcomp "$__git_cherry_pick_inprogress_options"
 		return
 	fi
+
+	__git_complete_strategy && return
+
 	case "$cur" in
 	--*)
 		__gitcomp_builtin cherry-pick "" \
@@ -1369,7 +1425,18 @@ _git_clean ()
 
 _git_clone ()
 {
+	case "$prev" in
+	-c|--config)
+		__git_complete_config_variable_name_and_value
+		return
+		;;
+	esac
 	case "$cur" in
+	--config=*)
+		__git_complete_config_variable_name_and_value \
+			--cur="${cur##--config=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin clone
 		return
@@ -1430,9 +1497,16 @@ __git_diff_algorithms="myers minimal patience histogram"
 
 __git_diff_submodule_formats="diff log short"
 
+__git_color_moved_opts="no default plain blocks zebra dimmed-zebra"
+
+__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change
+			ignore-all-space allow-indentation-change"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
+			--color-moved --color-moved= --no-color-moved
+			--color-moved-ws= --no-color-moved-ws
 			--full-index --binary --abbrev --diff-filter=
 			--find-copies-harder --ignore-cr-at-eol
 			--text --ignore-space-at-eol --ignore-space-change
@@ -1446,6 +1520,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
 			--submodule --submodule= --ignore-submodules
+			--indent-heuristic --no-indent-heuristic
+			--textconv --no-textconv
 "
 
 _git_diff ()
@@ -1461,6 +1537,14 @@ _git_diff ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		return
+		;;
 	--*)
 		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
 			--base --ours --theirs --no-index
@@ -1473,7 +1557,8 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
+			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
+			codecompare smerge
 "
 
 _git_difftool ()
@@ -1506,6 +1591,10 @@ _git_fetch ()
 		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
 		return
 		;;
+	--filter=*)
+		__gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin fetch
 		return
@@ -1620,9 +1709,9 @@ _git_help ()
 	esac
 	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
 	then
-		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(git --list-cmds=alias,list-guide) gitk"
+		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
 	else
-		__gitcomp "$(git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+		__gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
 	fi
 }
 
@@ -1702,8 +1791,8 @@ __git_log_shortlog_options="
 	--all-match --invert-grep
 "
 
-__git_log_pretty_formats="oneline short medium full fuller email raw format:"
-__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
+__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
 
 _git_log ()
 {
@@ -1749,6 +1838,10 @@ _git_log ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--no-walk=*)
+		__gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
+		return
+		;;
 	--*)
 		__gitcomp "
 			$__git_log_common_options
@@ -1756,16 +1849,19 @@ _git_log ()
 			$__git_log_gitk_options
 			--root --topo-order --date-order --reverse
 			--follow --full-diff
-			--abbrev-commit --abbrev=
+			--abbrev-commit --no-abbrev-commit --abbrev=
 			--relative-date --date=
 			--pretty= --format= --oneline
 			--show-signature
 			--cherry-mark
 			--cherry-pick
 			--graph
-			--decorate --decorate=
+			--decorate --decorate= --no-decorate
 			--walk-reflogs
+			--no-walk --no-walk= --do-walk
 			--parents --children
+			--expand-tabs --expand-tabs= --no-expand-tabs
+			--patch
 			$merge
 			$__git_diff_common_options
 			--pickaxe-all --pickaxe-regex
@@ -1969,15 +2065,18 @@ _git_range_diff ()
 	__git_complete_revlist
 }
 
+__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch"
+__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo"
+
 _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
+		__gitcomp "$__git_rebase_interactive_inprogress_options"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit --show-current-patch"
+		__gitcomp "$__git_rebase_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -1986,20 +2085,13 @@ _git_rebase ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--onto=*)
+		__git_complete_refs --cur="${cur##--onto=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--onto --merge --strategy --interactive
-			--rebase-merges --preserve-merges --stat --no-stat
-			--committer-date-is-author-date --ignore-date
-			--ignore-whitespace --whitespace=
-			--autosquash --no-autosquash
-			--fork-point --no-fork-point
-			--autostash --no-autostash
-			--verify --no-verify
-			--keep-empty --root --force-rebase --no-ff
-			--rerere-autoupdate
-			--exec
-			"
+		__gitcomp_builtin rebase "" \
+			"$__git_rebase_interactive_inprogress_options"
 
 		return
 	esac
@@ -2126,6 +2218,44 @@ _git_status ()
 	__git_complete_index_file "$complete_opt"
 }
 
+_git_switch ()
+{
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--*)
+		__gitcomp_builtin switch
+		;;
+	*)
+		# check if --track, --no-track, or --no-guess was specified
+		# if so, disable DWIM mode
+		local track_opt="--track" only_local_ref=n
+		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
+		   [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess")" ]; then
+			track_opt=''
+		fi
+		# explicit --guess enables DWIM mode regardless of
+		# $GIT_COMPLETION_CHECKOUT_NO_GUESS
+		if [ -n "$(__git_find_on_cmdline "--guess")" ]; then
+			track_opt='--track'
+		fi
+		if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then
+			only_local_ref=y
+		else
+			# --guess --detach is invalid combination, no
+			# dwim will be done when --detach is specified
+			track_opt=
+		fi
+		if [ $only_local_ref = y -a -z "$track_opt" ]; then
+			__gitcomp_direct "$(__git_heads "" "$cur" " ")"
+		else
+			__git_complete_refs $track_opt
+		fi
+		;;
+	esac
+}
+
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
@@ -2152,181 +2282,282 @@ __git_config_vars=
 __git_compute_config_vars ()
 {
 	test -n "$__git_config_vars" ||
-	__git_config_vars="$(git help --config-for-completion | sort | uniq)"
+	__git_config_vars="$(git help --config-for-completion | sort -u)"
 }
 
-_git_config ()
+# Completes possible values of various configuration variables.
+#
+# Usage: __git_complete_config_variable_value [<option>]...
+# --varname=<word>: The name of the configuration variable whose value is
+#                   to be completed.  Defaults to the previous word on the
+#                   command line.
+# --cur=<word>: The current value to be completed.  Defaults to the current
+#               word to be completed.
+__git_complete_config_variable_value ()
 {
-	local varname
+	local varname="$prev" cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--varname=*)	varname="${1##--varname=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
 
 	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
-		varname="${prev,,}"
+		varname="${varname,,}"
 	else
-		varname="$(echo "$prev" |tr A-Z a-z)"
+		varname="$(echo "$varname" |tr A-Z a-z)"
 	fi
 
 	case "$varname" in
 	branch.*.remote|branch.*.pushremote)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	branch.*.merge)
-		__git_complete_refs
+		__git_complete_refs --cur="$cur_"
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true merges preserve interactive"
+		__gitcomp "false true merges preserve interactive" "" "$cur_"
 		return
 		;;
 	remote.pushdefault)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	remote.*.fetch)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.fetch}"
-		if [ -z "$cur" ]; then
+		if [ -z "$cur_" ]; then
 			__gitcomp_nl "refs/heads/" "" "" ""
 			return
 		fi
-		__gitcomp_nl "$(__git_refs_remotes "$remote")"
+		__gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
 		return
 		;;
 	remote.*.push)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.push}"
 		__gitcomp_nl "$(__git for-each-ref \
-			--format='%(refname):%(refname)' refs/heads)"
+			--format='%(refname):%(refname)' refs/heads)" "" "$cur_"
 		return
 		;;
 	pull.twohead|pull.octopus)
 		__git_compute_merge_strategies
-		__gitcomp "$__git_merge_strategies"
-		return
-		;;
-	color.branch|color.diff|color.interactive|\
-	color.showbranch|color.status|color.ui)
-		__gitcomp "always never auto"
+		__gitcomp "$__git_merge_strategies" "" "$cur_"
 		return
 		;;
 	color.pager)
-		__gitcomp "false true"
+		__gitcomp "false true" "" "$cur_"
 		return
 		;;
 	color.*.*)
 		__gitcomp "
 			normal black red green yellow blue magenta cyan white
 			bold dim ul blink reverse
-			"
+			" "" "$cur_"
+		return
+		;;
+	color.*)
+		__gitcomp "false true always never auto" "" "$cur_"
 		return
 		;;
 	diff.submodule)
-		__gitcomp "log short"
+		__gitcomp "$__git_diff_submodule_formats" "" "$cur_"
 		return
 		;;
 	help.format)
-		__gitcomp "man info web html"
+		__gitcomp "man info web html" "" "$cur_"
 		return
 		;;
 	log.date)
-		__gitcomp "$__git_log_date_formats"
+		__gitcomp "$__git_log_date_formats" "" "$cur_"
 		return
 		;;
 	sendemail.aliasfiletype)
-		__gitcomp "mutt mailrc pine elm gnus"
+		__gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
 		return
 		;;
 	sendemail.confirm)
-		__gitcomp "$__git_send_email_confirm_options"
+		__gitcomp "$__git_send_email_confirm_options" "" "$cur_"
 		return
 		;;
 	sendemail.suppresscc)
-		__gitcomp "$__git_send_email_suppresscc_options"
+		__gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
 		return
 		;;
 	sendemail.transferencoding)
-		__gitcomp "7bit 8bit quoted-printable base64"
-		return
-		;;
-	--get|--get-all|--unset|--unset-all)
-		__gitcomp_nl "$(__git_config_get_set_variables)"
+		__gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
 		return
 		;;
 	*.*)
 		return
 		;;
 	esac
-	case "$cur" in
-	--*)
-		__gitcomp_builtin config
-		return
-		;;
+}
+
+# Completes configuration sections, subsections, variable names.
+#
+# Usage: __git_complete_config_variable_name [<option>]...
+# --cur=<word>: The current configuration section/variable name to be
+#               completed.  Defaults to the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each fully completed
+#                 configuration variable name (but not to sections or
+#                 subsections) instead of the default space.
+__git_complete_config_variable_name ()
+{
+	local cur_="$cur" sfx
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
 	branch.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	branch.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur%.*}."
+		cur_="${cur#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	guitool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
 			argPrompt cmd confirm needsFile noConsole noRescan
 			prompt revPrompt revUnmerged title
-			" "$pfx" "$cur_"
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	difftool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	man.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	mergetool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	pager.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
 			url proxy fetch push mirror skipDefaultUpdate
 			receivepack uploadpack tagOpt pushurl
-			" "$pfx" "$cur_"
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	url.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	*.*)
 		__git_compute_config_vars
-		__gitcomp "$__git_config_vars"
+		__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
 		;;
 	*)
 		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
+		__gitcomp "$(echo "$__git_config_vars" |
+				awk -F . '{
+					sections[$1] = 1
+				}
+				END {
+					for (s in sections)
+						print s "."
+				}
+				')" "" "$cur_"
+		;;
+	esac
+}
+
+# Completes '='-separated configuration sections/variable names and values
+# for 'git -c section.name=value'.
+#
+# Usage: __git_complete_config_variable_name_and_value [<option>]...
+# --cur=<word>: The current configuration section/variable name/value to be
+#               completed. Defaults to the current word to be completed.
+__git_complete_config_variable_name_and_value ()
+{
+	local cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
+	*=*)
+		__git_complete_config_variable_value \
+			--varname="${cur_%%=*}" --cur="${cur_#*=}"
+		;;
+	*)
+		__git_complete_config_variable_name --cur="$cur_" --sfx='='
+		;;
+	esac
+}
+
+_git_config ()
+{
+	case "$prev" in
+	--get|--get-all|--unset|--unset-all)
+		__gitcomp_nl "$(__git_config_get_set_variables)"
+		return
+		;;
+	*.*)
+		__git_complete_config_variable_value
+		return
+		;;
+	esac
+	case "$cur" in
+	--*)
+		__gitcomp_builtin config
+		;;
+	*)
+		__git_complete_config_variable_name
+		;;
 	esac
 }
 
@@ -2388,6 +2619,10 @@ _git_remote ()
 _git_replace ()
 {
 	case "$cur" in
+	--format=*)
+		__gitcomp "short medium long" "" "${cur##--format=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin replace
 		return
@@ -2420,7 +2655,22 @@ _git_reset ()
 	__git_complete_refs
 }
 
-__git_revert_inprogress_options="--continue --quit --abort"
+_git_restore ()
+{
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--source=*)
+		__git_complete_refs --cur="${cur##--source=}"
+		;;
+	--*)
+		__gitcomp_builtin restore
+		;;
+	esac
+}
+
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
 
 _git_revert ()
 {
@@ -2429,6 +2679,7 @@ _git_revert ()
 		__gitcomp "$__git_revert_inprogress_options"
 		return
 	fi
+	__git_complete_strategy && return
 	case "$cur" in
 	--*)
 		__gitcomp_builtin revert "" \
@@ -2487,8 +2738,9 @@ _git_show ()
 		return
 		;;
 	--*)
-		__gitcomp "--pretty= --format= --abbrev-commit --oneline
-			--show-signature
+		__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
+			--oneline --show-signature --patch
+			--expand-tabs --expand-tabs= --no-expand-tabs
 			$__git_diff_common_options
 			"
 		return
@@ -2508,6 +2760,27 @@ _git_show_branch ()
 	__git_complete_revlist
 }
 
+_git_sparse_checkout ()
+{
+	local subcommands="list init set disable"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	init,--*)
+		__gitcomp "--cone"
+		;;
+	set,--*)
+		__gitcomp "--stdin"
+		;;
+	*)
+		;;
+	esac
+}
+
 _git_stash ()
 {
 	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
@@ -2573,7 +2846,7 @@ _git_submodule ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init deinit update summary foreach sync"
+	local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
@@ -2604,6 +2877,9 @@ _git_submodule ()
 			--force --rebase --merge --reference --depth --recursive --jobs
 		"
 		;;
+	set-branch,--*)
+		__gitcomp "--default --branch"
+		;;
 	summary,--*)
 		__gitcomp "--cached --files --summary-limit"
 		;;
@@ -2634,6 +2910,7 @@ _git_svn ()
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
 			--add-author-from
+			--recursive
 			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
@@ -2755,33 +3032,83 @@ _git_whatchanged ()
 	_git_log
 }
 
+__git_complete_worktree_paths ()
+{
+	local IFS=$'\n'
+	__gitcomp_nl "$(git worktree list --porcelain |
+		# Skip the first entry: it's the path of the main worktree,
+		# which can't be moved, removed, locked, etc.
+		sed -n -e '2,$ s/^worktree //p')"
+}
+
 _git_worktree ()
 {
 	local subcommands="add list lock move prune remove unlock"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
+	local subcommand subcommand_idx
+
+	subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")"
+	subcommand_idx="${subcommand% *}"
+	subcommand="${subcommand#* }"
+
+	case "$subcommand,$cur" in
+	,*)
 		__gitcomp "$subcommands"
-	else
-		case "$subcommand,$cur" in
-		add,--*)
-			__gitcomp_builtin worktree_add
+		;;
+	*,--*)
+		__gitcomp_builtin worktree_$subcommand
+		;;
+	add,*)	# usage: git worktree add [<options>] <path> [<commit-ish>]
+		# Here we are not completing an --option, it's either the
+		# path or a ref.
+		case "$prev" in
+		-b|-B)	# Complete refs for branch to be created/reseted.
+			__git_complete_refs
 			;;
-		list,--*)
-			__gitcomp_builtin worktree_list
+		-*)	# The previous word is an -o|--option without an
+			# unstuck argument: have to complete the path for
+			# the new worktree, so don't list anything, but let
+			# Bash fall back to filename completion.
 			;;
-		lock,--*)
-			__gitcomp_builtin worktree_lock
-			;;
-		prune,--*)
-			__gitcomp_builtin worktree_prune
-			;;
-		remove,--*)
-			__gitcomp "--force"
-			;;
-		*)
+		*)	# The previous word is not an --option, so it must
+			# be either the 'add' subcommand, the unstuck
+			# argument of an option (e.g. branch for -b|-B), or
+			# the path for the new worktree.
+			if [ $cword -eq $((subcommand_idx+1)) ]; then
+				# Right after the 'add' subcommand: have to
+				# complete the path, so fall back to Bash
+				# filename completion.
+				:
+			else
+				case "${words[cword-2]}" in
+				-b|-B)	# After '-b <branch>': have to
+					# complete the path, so fall back
+					# to Bash filename completion.
+					;;
+				*)	# After the path: have to complete
+					# the ref to be checked out.
+					__git_complete_refs
+					;;
+				esac
+			fi
 			;;
 		esac
-	fi
+		;;
+	lock,*|remove,*|unlock,*)
+		__git_complete_worktree_paths
+		;;
+	move,*)
+		if [ $cword -eq $((subcommand_idx+1)) ]; then
+			# The first parameter must be an existing working
+			# tree to be moved.
+			__git_complete_worktree_paths
+		else
+			# The second parameter is the destination: it could
+			# be any path, so don't list anything, but let Bash
+			# fall back to filename completion.
+			:
+		fi
+		;;
+	esac
 }
 
 __git_complete_common () {
@@ -2860,7 +3187,11 @@ __git_main ()
 			# Bash filename completion
 			return
 			;;
-		-c|--namespace)
+		-c)
+			__git_complete_config_variable_name_and_value
+			return
+			;;
+		--namespace)
 			# we don't support completing these options' arguments
 			return
 			;;
@@ -2888,7 +3219,7 @@ __git_main ()
 			then
 				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
 			else
-				__gitcomp "$(git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
 			fi
 			;;
 		esac
@@ -3052,4 +3383,4 @@ __git_complete gitk __gitk_main
 #
 if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
 __git_complete git.exe __git_main
-fi
\ No newline at end of file
+fi

From e9467825ec03c9cd23140d62f4c7fa86299b62c1 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Wed, 22 Apr 2020 11:16:10 +0200
Subject: [PATCH 202/388] Removed assert_link_exist function

This is now provided by the used version of bats-file.
---
 test/test_helper.bash | 45 -------------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/test/test_helper.bash b/test/test_helper.bash
index ef46cc4e..17616f36 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -85,48 +85,3 @@ teardown() {
   rm -rf "${BASH_IT_TEST_DIR}"
   temp_del "${TEST_TEMP_DIR}"
 }
-
-# Fail and display path of the link if it does not exist. Also fails
-# if the path exists, but is not a link.
-# This function is the logical complement of `assert_file_not_exist'.
-# There is no dedicated function for checking that a link does not exist.
-#
-# Globals:
-#   BATSLIB_FILE_PATH_REM
-#   BATSLIB_FILE_PATH_ADD
-# Arguments:
-#   $1 - path
-# Returns:
-#   0 - link exists and is a link
-#   1 - otherwise
-# Outputs:
-#   STDERR - details, on failure
-assert_link_exist() {
-  local -r file="$1"
-  local -r target="$2"
-  if [[ ! -L "$file" ]]; then
-    local -r rem="$BATSLIB_FILE_PATH_REM"
-    local -r add="$BATSLIB_FILE_PATH_ADD"
-    if [[ -e "$file" ]]; then
-      batslib_print_kv_single 4 'path' "${file/$rem/$add}" \
-        | batslib_decorate 'exists, but is not a link' \
-        | fail
-    else
-      batslib_print_kv_single 4 'path' "${file/$rem/$add}" \
-        | batslib_decorate 'link does not exist' \
-        | fail
-    fi
-  else
-    if [ -n "$target" ]; then
-      local link_target=''
-      link_target=$(readlink "$file")
-      if [[ "$link_target" != "$target" ]]; then
-        batslib_print_kv_single_or_multi 8 'path' "${file/$rem/$add}" \
-            'expected' "$target" \
-            'actual'   "$link_target" \
-          | batslib_decorate 'link exists, but does not point to target file' \
-          | fail
-      fi
-    fi
-  fi
-}

From cbe2986210da7dc3ceaf33aee96093acf3bcbcdd Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Wed, 22 Apr 2020 11:19:18 +0200
Subject: [PATCH 203/388] Updated test readme

---
 test/README.md | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/test/README.md b/test/README.md
index d227e3c1..0b19fc0f 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,4 +1,13 @@
-## Testing with [Bats](https://github.com/sstephenson/bats#installing-bats-from-source)
+# Testing with Bats
+
+## Overview
+
+The Bash-it unit tests leverage the [Bats unit test framework for Bash](https://github.com/bats-core/bats-core).
+There is no need to install Bats explicitly, the test run script will automatically download and install Bats and its dependencies.
+
+When making changes to Bash-it, the tests are automatically executed in a test build environment on [Travis CI](https://travis-ci.com).
+
+## Test Execution
 
 To execute the unit tests, please run the `run` script:
 
@@ -10,4 +19,22 @@ To execute the unit tests, please run the `run` script:
 test/run
 ```
 
-The `run` script will automatically install [Bats](https://github.com/sstephenson/bats#installing-bats-from-source) if it is not already present, and will then run all tests found under the `test` directory, including subdirectories.
+The `run` script will automatically install if it is not already present, and will then run all tests found under the `test` directory, including subdirectories.
+
+To run only a subset of the tests, you can provide the name of the test subdirectory that you want to run, e.g. like this for the tests in the `test/themes` directory:
+
+```bash
+# If you are in the root `.bash_it` directory:
+test/run test/themes
+```
+
+By default, the tests run in single-threaded mode.
+If you want to speed up the test execution, you can install the [GNU `parallel` tool](https://www.gnu.org/software/parallel/), which is supported by Bats.
+When using `parallel`, the `test/run` script will use a number of threads in parallel, depending on the available CPU cores of your system.
+This can speed up test execution significantly.
+
+## Writing Tests
+
+When adding or modifying tests, please stick to the format and conventions of the existing test cases.
+The `test_helper.bash` script provides a couple of reusable helper functions that you should use when writing a test case,
+for example for setting up an isolated test environment.

From 91a96a4af259108b8fb6190c6bbf4dccbdb3a9f7 Mon Sep 17 00:00:00 2001
From: Jeremy Mathevet <jeremy@mathevet.net>
Date: Mon, 27 Apr 2020 11:45:19 +0800
Subject: [PATCH 204/388] gh to alias ghm

---
 aliases/available/git.aliases.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index cae55f21..913e8435 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -106,7 +106,7 @@ alias gswt="git switch --track"
 # Git home
 alias ghm='cd "$(git rev-parse --show-toplevel)"'
 if ! _command_exists gh; then
-  alias gh='cd "$(git rev-parse --show-toplevel)"'
+  alias gh='ghm'
 fi
 # Show untracked files
 alias gu='git ls-files . --exclude-standard --others'

From 4835f1905e27e1f97ffedd5c664b2d2670f8a0a4 Mon Sep 17 00:00:00 2001
From: Rick Rezinas <rrezinas@gmail.com>
Date: Mon, 27 Apr 2020 21:22:23 -0700
Subject: [PATCH 205/388] fix for issue #1418

---
 plugins/available/aws.plugin.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/available/aws.plugin.bash b/plugins/available/aws.plugin.bash
index 66021267..54a86691 100644
--- a/plugins/available/aws.plugin.bash
+++ b/plugins/available/aws.plugin.bash
@@ -40,7 +40,8 @@ function __awskeys_help {
 function __awskeys_get {
     local ln=$(grep -n "\[ *$1 *\]" "${AWS_SHARED_CREDENTIALS_FILE}" | cut -d ":" -f 1)
     if [[ -n "${ln}" ]]; then
-        tail -n +${ln} "${AWS_SHARED_CREDENTIALS_FILE}" | egrep -m 3 "aws_access_key_id|aws_secret_access_key|aws_session_token"
+        tail -n +${ln} "${AWS_SHARED_CREDENTIALS_FILE}" | egrep -m 2 "aws_access_key_id|aws_secret_access_key"
+        tail -n +${ln} "${AWS_SHARED_CREDENTIALS_FILE}" | egrep -m 1 "aws_session_token"
     fi
 }
 

From 1953c54a9c8281c1acf1c7acafb1b77a26f2dfb3 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Wed, 29 Apr 2020 16:03:30 +0200
Subject: [PATCH 206/388] Updated to bats-core v1.2.0

Also updated the bats-file remote URL.
---
 .gitmodules        | 3 ++-
 test_lib/bats-core | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c337c96c..57b46adc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "test_lib/bats-core"]
 	path = test_lib/bats-core
 	url = https://github.com/bats-core/bats-core
+	branch = tags/v1.2.0
 [submodule "test_lib/bats-support"]
 	path = test_lib/bats-support
 	url = https://github.com/bats-core/bats-support
@@ -11,5 +12,5 @@
 	branch = tags/v2.0.0
 [submodule "test_lib/bats-file"]
 	path = test_lib/bats-file
-	url = https://github.com/tralston/bats-file
+	url = https://github.com/bats-core/bats-file
 	branch = tags/v0.3.0
diff --git a/test_lib/bats-core b/test_lib/bats-core
index da4cefe3..73b8d2f9 160000
--- a/test_lib/bats-core
+++ b/test_lib/bats-core
@@ -1 +1 @@
-Subproject commit da4cefe3010145d2eb699125a4b1efdff4409f3b
+Subproject commit 73b8d2f95513207b319efe34685553b75c0b214e

From e2150602c7c92fae2f06d88a031b225bc1f62b15 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Fri, 1 May 2020 09:17:18 -0500
Subject: [PATCH 207/388] add powerline config for prompt after chars

---
 themes/powerline-plain/powerline-plain.base.bash | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/powerline-plain/powerline-plain.base.bash b/themes/powerline-plain/powerline-plain.base.bash
index 37b4ff50..1b214fdb 100644
--- a/themes/powerline-plain/powerline-plain.base.bash
+++ b/themes/powerline-plain/powerline-plain.base.bash
@@ -51,7 +51,12 @@ function __powerline_prompt_command {
     LEFT_PROMPT+=" "
   fi
 
-  PS1="${LEFT_PROMPT}"
+  ## after prompt ##
+  if [[ -n "${POWERLINE_PROMPT_AFTER}" ]]; then
+    PROMPT_AFTER="${POWERLINE_PROMPT_AFTER}"
+  fi
+
+  PS1="${LEFT_PROMPT}${PROMPT_AFTER}"
 
   ## cleanup ##
   unset LAST_SEGMENT_COLOR \

From 023802fcd60cec7ec34f859829d706302c6a6497 Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Fri, 1 May 2020 19:45:43 +0000
Subject: [PATCH 208/388] travis: Give jobs names

It's easier to read a long job list when the jobs are named.

Reference:
https://docs.travis-ci.com/user/build-stages/#naming-your-jobs-within-build-stages
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a35f07a0..6fde9c4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ language: shell
 
 jobs:
   - <<: *native_job
+    name: default Ubuntu
     os: linux
   - <<: *native_job
+    name: MacOS
     os: osx

From 62bf3bf097ad0362a34fad12bd22f559d808424e Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Sat, 2 May 2020 14:16:18 +0200
Subject: [PATCH 209/388] Fix search plugin tests

Had to move the `cite` definition up a couple of lines, since `_about`
is used in some of the tested plugins

Fixes #1582
---
 test/lib/search.bats | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/lib/search.bats b/test/lib/search.bats
index da448acc..a7c1a23f 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -5,6 +5,9 @@ load ../../lib/composure
 load ../../lib/helpers
 load ../../lib/utilities
 load ../../lib/search
+
+cite _about _param _example _group _author _version
+
 load ../../plugins/available/base.plugin
 load ../../aliases/available/git.aliases
 load ../../plugins/available/ruby.plugin
@@ -13,8 +16,6 @@ load ../../completion/available/bundler.completion
 load ../../completion/available/gem.completion
 load ../../completion/available/rake.completion
 
-cite _about _param _example _group _author _version
-
 load ../../lib/helpers
 
 function local_setup {

From ec384be4bea939c3e3e055d02006ffc0df0c8d5a Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Sat, 2 May 2020 14:46:05 +0200
Subject: [PATCH 210/388] Remove echo when a dead SSH Agent PID is found

This case can be safely ignored, no need to print a message for that.

Fixes #1579
---
 plugins/available/sshagent.plugin.bash | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/available/sshagent.plugin.bash b/plugins/available/sshagent.plugin.bash
index a96a044b..42acfb51 100644
--- a/plugins/available/sshagent.plugin.bash
+++ b/plugins/available/sshagent.plugin.bash
@@ -94,7 +94,6 @@ function _ensure_valid_sshagent_env() {
     return
   fi
 
-  echo "There's a dead ssh-agent at the landing..."
   ssh-agent > "${SSH_AGENT_ENV}"
   return
 }
@@ -125,7 +124,7 @@ function sshagent() {
   about 'ensures ssh-agent is up and running'
   param '1: on|off '
   example '$ sshagent on'
-  group 'ssh'    
+  group 'ssh'
   [[ -z "${SSH_AGENT_ENV}" ]] \
   && export SSH_AGENT_ENV="${HOME}/.ssh/agent_env.${HOSTNAME}"
 

From dddb8636577b3dc7d8fc1a9355104afd80115eef Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Sat, 2 May 2020 08:43:08 -0500
Subject: [PATCH 211/388] change from feedback

---
 themes/powerline-plain/powerline-plain.base.bash  | 6 +-----
 themes/powerline-plain/powerline-plain.theme.bash | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/themes/powerline-plain/powerline-plain.base.bash b/themes/powerline-plain/powerline-plain.base.bash
index 1b214fdb..ce91ef89 100644
--- a/themes/powerline-plain/powerline-plain.base.bash
+++ b/themes/powerline-plain/powerline-plain.base.bash
@@ -32,6 +32,7 @@ function __powerline_prompt_command {
   LEFT_PROMPT=""
   SEGMENTS_AT_LEFT=0
   LAST_SEGMENT_COLOR=""
+  PROMPT_AFTER="${POWERLINE_PROMPT_AFTER}"
 
   _save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
@@ -51,11 +52,6 @@ function __powerline_prompt_command {
     LEFT_PROMPT+=" "
   fi
 
-  ## after prompt ##
-  if [[ -n "${POWERLINE_PROMPT_AFTER}" ]]; then
-    PROMPT_AFTER="${POWERLINE_PROMPT_AFTER}"
-  fi
-
   PS1="${LEFT_PROMPT}${PROMPT_AFTER}"
 
   ## cleanup ##
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 942c411c..709fe341 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -12,6 +12,7 @@ POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLI
 POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
 POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
 POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+POWERLINE_PROMPT_AFTER="${POWERLINE_PROMPT_AFTER:-''}"
 
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="ⓔ "}

From 38bb8c087c99dacba29db85a87fbc1f0426c08f3 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Thu, 7 May 2020 08:57:37 +0200
Subject: [PATCH 212/388] Reworded the text for the general/bash-it alias
 loading

Also fixed a ShellCheck warning.

See #1560 for more details.
---
 aliases/available/bash-it.aliases.bash |  3 +--
 aliases/available/general.aliases.bash | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/aliases/available/bash-it.aliases.bash b/aliases/available/bash-it.aliases.bash
index 2461e830..d2975667 100644
--- a/aliases/available/bash-it.aliases.bash
+++ b/aliases/available/bash-it.aliases.bash
@@ -1,5 +1,5 @@
 cite about-alias
-about-alias 'Aliases for the bash-it command (those aliases are also included with general aliases)'
+about-alias 'Aliases for the bash-it command (these aliases are automatically included with the "general" aliases)'
 
 # Common misspellings of bash-it
 alias shit='bash-it'
@@ -21,4 +21,3 @@ alias bshsch="bash-it search"
 alias bshenp="bash-it enable plugin"
 alias bshena="bash-it enable alias"
 alias bshenc="bash-it enable completion"
-
diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index d628e71d..7e6f79cb 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -93,8 +93,11 @@ catt() {
   done
 }
 
-# The bash-it aliases was move to bash-it.aliases.bash file. The intent of this
-# is to maintain the script readable and less bloated. If you don't need to use
-# those aliases, but you want the bash-it shortcuts, you can disable this 
-# script and enable the bash-it.
+# The Bash-it aliases were moved to the `bash-it.aliases.bash` file. The intent of this
+# is to keep the script readable and less bloated. If you don't need to use
+# the `general` aliases, but you want the Bash-it aliases, you can disable the `general`
+# aliases and enable just the ones for Bash-it explicitly:
+# bash-it disable alias general
+# bash-it enable alias bash-it
+# shellcheck source=./bash-it.aliases.bash
 source "$BASH_IT/aliases/available/bash-it.aliases.bash"

From 8f3872acb88fbedffca3d443cdc96ac34400ba34 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Thu, 7 May 2020 13:08:27 -0500
Subject: [PATCH 213/388] review2

---
 themes/powerline-plain/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 049c12f1..0a8a75ad 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -85,5 +85,6 @@ You can configure various aspects of the prompt to use less whitespace. Supporte
 |POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
 |POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
 |POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
+|POWERLINE_PROMPT_AFTER                | Adds characters after the prompt
 
 The default value for all settings is `0` (disabled). Use `1` to enable.

From ad9876e6e37a07b2a6b31d05cdc8da0f9368f479 Mon Sep 17 00:00:00 2001
From: buhl <221842+buhl@users.noreply.github.com>
Date: Sat, 9 May 2020 12:13:11 +0200
Subject: [PATCH 214/388] Removed initialization of empty VIRTUAL_ENV

When spawning a new bash session when entering a virtual environment
the VIRTUAL_ENV is overwritten by this line.
However not having this line does not affect the bin/activate script.
---
 themes/base.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 7452eb9f..81bbec68 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -74,7 +74,7 @@ THEME_SHOW_USER_HOST=${THEME_SHOW_USER_HOST:=false}
 USER_HOST_THEME_PROMPT_PREFIX=''
 USER_HOST_THEME_PROMPT_SUFFIX=''
 
-VIRTUAL_ENV=
+#VIRTUAL_ENV=
 
 VIRTUALENV_THEME_PROMPT_PREFIX=' |'
 VIRTUALENV_THEME_PROMPT_SUFFIX='|'

From 9f3889c2848384c8f20ec74a74d701d93f6cb1c3 Mon Sep 17 00:00:00 2001
From: Alex Thiessen <alex.thiessen.de+github@gmail.com>
Date: Mon, 11 May 2020 02:30:10 +0200
Subject: [PATCH 215/388] test: Make `rsync` optional

For bulk copying, `rsync` is used in test code, which is rather fast and
capable of saving needless write operations. The downside is that tests
fail when the tool is missing, which is the case with most minimal Linux
setups (e.g. containers or even Gnome installations of Debian).

Provide an alternative way for sufficiently fast copying by means of
`find -exec cp`. Measured total test time penalty is less than 0.5%.
Downside of needless write operations remains in case of fallback.
---
 test/bash_it/bash_it.bats |  9 ++++++++-
 test/test_helper.bash     | 18 +++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats
index af2f15e9..6867c7fb 100644
--- a/test/bash_it/bash_it.bats
+++ b/test/bash_it/bash_it.bats
@@ -7,7 +7,14 @@ function local_setup {
   setup_test_fixture
 
   # Copy the test fixture to the Bash-it folder
-  rsync -a "$BASH_IT/test/fixtures/bash_it/" "$BASH_IT/"
+  if command -v rsync &> /dev/null
+  then
+    rsync -a "$BASH_IT/test/fixtures/bash_it/" "$BASH_IT/"
+  else
+    find "$BASH_IT/test/fixtures/bash_it" \
+      -mindepth 1 -maxdepth 1 \
+      -exec cp -r {} "$BASH_IT/" \;
+  fi
 }
 
 @test "bash-it: verify that the test fixture is available" {
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 17616f36..4264c20c 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -31,9 +31,21 @@ local_teardown() {
 setup_test_fixture() {
   mkdir -p "$BASH_IT"
   lib_directory="$(cd "$(dirname "$0")" && pwd)"
-  # Use rsync to copy Bash-it to the temp folder
-  # rsync is faster than cp, since we can exclude the large ".git" folder
-  rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled $lib_directory/../../../.. "$BASH_IT"
+  local src_topdir="$lib_directory/../../../.."
+
+  if command -v rsync &> /dev/null
+  then
+    # Use rsync to copy Bash-it to the temp folder
+    rsync -qavrKL -d --delete-excluded --exclude=.git --exclude=enabled "$src_topdir" "$BASH_IT"
+  else
+    rm -rf "$BASH_IT"
+    mkdir -p "$BASH_IT"
+
+    find "$src_topdir" \
+      -mindepth 1 -maxdepth 1 \
+      -not -name .git \
+      -exec cp -r {} "$BASH_IT" \;
+  fi
 
   rm -rf "$BASH_IT"/enabled
   rm -rf "$BASH_IT"/aliases/enabled

From 37aff10e582a99ede5d4c31dec3c84c591d99c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Eduardo=20Montenegro=20Cavalcanti=20de=20Olive?=
 =?UTF-8?q?ira?= <jose.eduardo.mco@gmail.com>
Date: Tue, 12 May 2020 05:34:45 -0300
Subject: [PATCH 216/388] Update build badge link to travis-ci.com

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ccaa7946..adb783e6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Bash-it
 
-[![Build Status](https://travis-ci.org/Bash-it/bash-it.svg?branch=master)](https://travis-ci.org/Bash-it/bash-it) [![Join the chat at https://gitter.im/Bash-it/bash-it](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Bash-it/bash-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.com/Bash-it/bash-it.svg?branch=master)](https://travis-ci.com/Bash-it/bash-it)
+[![Join the chat at https://gitter.im/Bash-it/bash-it](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Bash-it/bash-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 **Bash-it** is a collection of community Bash commands and scripts for Bash 3.2+.
 (And a shameless ripoff of [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) :smiley:)

From 0122497e6cff0b7911cc574fc701fd98880298c0 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Wed, 13 May 2020 10:25:36 +0200
Subject: [PATCH 217/388] Removed VS Code Plugin, since VS Code provides the
 `code` command out of the box now.

---
 plugins/available/visual-studio-code.plugin.bash | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 plugins/available/visual-studio-code.plugin.bash

diff --git a/plugins/available/visual-studio-code.plugin.bash b/plugins/available/visual-studio-code.plugin.bash
deleted file mode 100644
index 5bc20995..00000000
--- a/plugins/available/visual-studio-code.plugin.bash
+++ /dev/null
@@ -1,12 +0,0 @@
-cite about-plugin
-about-plugin 'Defines the `code` executable for Visual Studio Code on OS X'
-
-# Based on https://code.visualstudio.com/Docs/editor/setup
-if [[ `uname -s` == "Darwin" ]]; then
-  function code () {
-    about 'Starts Visual Studio Code in the provided directory'
-    group 'visual-studio-code'
-
-    VSCODE_CWD="$PWD" open -n -b "com.microsoft.VSCode" --args $* ;
-  }
-fi

From b3631ba13a84d26288e7e904bf0c81799b14884d Mon Sep 17 00:00:00 2001
From: Al Johri <atul@Als-MacBook-Air.local>
Date: Mon, 18 Aug 2014 14:39:57 -0400
Subject: [PATCH 218/388] add ohmyzsh, robbyrussell theme

---
 themes/robbyrussell/robbyrussell.theme.bash | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 themes/robbyrussell/robbyrussell.theme.bash

diff --git a/themes/robbyrussell/robbyrussell.theme.bash b/themes/robbyrussell/robbyrussell.theme.bash
new file mode 100644
index 00000000..5745ab1e
--- /dev/null
+++ b/themes/robbyrussell/robbyrussell.theme.bash
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+SCM_THEME_PROMPT_DIRTY=" ${bold_yellow}✗"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+SCM_THEME_PROMPT_PREFIX=" ${bold_blue}scm:("
+SCM_THEME_PROMPT_SUFFIX="${bold_blue})"
+
+GIT_THEME_PROMPT_DIRTY=" ${bold_yellow}✗"
+GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+GIT_THEME_PROMPT_PREFIX=" ${bold_blue}git:("
+GIT_THEME_PROMPT_SUFFIX="${bold_blue})"
+
+RVM_THEME_PROMPT_PREFIX="|"
+RVM_THEME_PROMPT_SUFFIX="|"
+
+function git_prompt_info {
+  git_prompt_vars
+  echo -e "$SCM_PREFIX${bold_red}$SCM_BRANCH$SCM_STATE$SCM_SUFFIX"
+}
+
+
+function prompt_command() {
+    PS1="${bold_green}➜  ${bold_cyan}\W${reset_color}$(scm_prompt_info)${reset_color} "
+}
+
+PROMPT_COMMAND=prompt_command;

From 3bfec8e682e14d151d990189e38b56c38a0fbb4a Mon Sep 17 00:00:00 2001
From: buhl <221842+buhl@users.noreply.github.com>
Date: Wed, 13 May 2020 22:01:20 +0200
Subject: [PATCH 219/388] Removed empty VIRTUAL_ENV declaration in the base
 theme

---
 themes/base.theme.bash | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 81bbec68..44ccb402 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -74,8 +74,6 @@ THEME_SHOW_USER_HOST=${THEME_SHOW_USER_HOST:=false}
 USER_HOST_THEME_PROMPT_PREFIX=''
 USER_HOST_THEME_PROMPT_SUFFIX=''
 
-#VIRTUAL_ENV=
-
 VIRTUALENV_THEME_PROMPT_PREFIX=' |'
 VIRTUALENV_THEME_PROMPT_SUFFIX='|'
 

From 981929cff00c961e9256885336bbd1ca90eb127a Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Sat, 16 May 2020 15:05:26 -0700
Subject: [PATCH 220/388] Fixed quoting on POWERLINE_PROMPT_AFTER

---
 themes/powerline-plain/powerline-plain.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 709fe341..6ae81a56 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -12,7 +12,7 @@ POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLI
 POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
 POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
 POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
-POWERLINE_PROMPT_AFTER="${POWERLINE_PROMPT_AFTER:-''}"
+POWERLINE_PROMPT_AFTER=${POWERLINE_PROMPT_AFTER:-""}
 
 PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="ⓔ "}
 CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="ⓔ "}

From e05dd4c7783cf07a604d0b4db3037f645d192cd8 Mon Sep 17 00:00:00 2001
From: PntAndCnt <peanutandchestnut@gmail.com>
Date: Mon, 18 May 2020 22:14:17 +0800
Subject: [PATCH 221/388] Use default GREP_COLOR.

---
 aliases/available/general.aliases.bash | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 7e6f79cb..0c7bcd9d 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -28,7 +28,6 @@ alias vbpf="vim ~/.bash_profile"
 if grep --color=auto "a" "${BASH_IT}/"*.md &> /dev/null
 then
   alias grep='grep --color=auto'
-  export GREP_COLOR='1;33'
 fi
 
 if which gshuf &> /dev/null

From 3188f635e288ec18cfe3ff3c886ce1a258de12ed Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Mon, 18 May 2020 15:01:57 -0500
Subject: [PATCH 222/388] source distro provided docker completion

---
 completion/available/docker.completion.bash | 5634 +------------------
 1 file changed, 19 insertions(+), 5615 deletions(-)

diff --git a/completion/available/docker.completion.bash b/completion/available/docker.completion.bash
index 2b3e805c..bb38ca7f 100644
--- a/completion/available/docker.completion.bash
+++ b/completion/available/docker.completion.bash
@@ -1,5617 +1,21 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2016,SC2119,SC2155,SC2206,SC2207
-#
-# Shellcheck ignore list:
-#  - SC2016: Expressions don't expand in single quotes, use double quotes for that.
-#  - SC2119: Use foo "$@" if function's $1 should mean script's $1.
-#  - SC2155: Declare and assign separately to avoid masking return values.
-#  - SC2206: Quote to prevent word splitting, or split robustly with mapfile or read -a.
-#  - SC2207: Prefer mapfile or read -a to split command output (or quote to avoid splitting).
-#
-# You can find more details for each warning at the following page:
-#    https://github.com/koalaman/shellcheck/wiki/<SCXXXX>
-#
-# bash completion file for core docker commands
-#
-# This script provides completion of:
-#  - commands and their options
-#  - container ids and names
-#  - image repos and tags
-#  - filepaths
-#
-# To enable the completions either:
-#  - place this file in /etc/bash_completion.d
-#  or
-#  - copy this file to e.g. ~/.docker-completion.sh and add the line
-#    below to your .bashrc after bash completion features are loaded
-#    . ~/.docker-completion.sh
-#
-# Configuration:
-#
-# For several commands, the amount of completions can be configured by
-# setting environment variables.
-#
-# DOCKER_COMPLETION_SHOW_CONFIG_IDS
-# DOCKER_COMPLETION_SHOW_CONTAINER_IDS
-# DOCKER_COMPLETION_SHOW_NETWORK_IDS
-# DOCKER_COMPLETION_SHOW_NODE_IDS
-# DOCKER_COMPLETION_SHOW_PLUGIN_IDS
-# DOCKER_COMPLETION_SHOW_SECRET_IDS
-# DOCKER_COMPLETION_SHOW_SERVICE_IDS
-#   "no"  - Show names only (default)
-#   "yes" - Show names and ids
-#
-# You can tailor completion for the "events", "history", "inspect", "run",
-# "rmi" and "save" commands by settings the following environment
-# variables:
-#
-# DOCKER_COMPLETION_SHOW_IMAGE_IDS
-#   "none" - Show names only (default)
-#   "non-intermediate" - Show names and ids, but omit intermediate image IDs
-#   "all" - Show names and ids, including intermediate image IDs
-#
-# DOCKER_COMPLETION_SHOW_TAGS
-#   "yes" - include tags in completion options (default)
-#   "no"  - don't include tags in completion options
 
-#
-# Note:
-# Currently, the completions will not work if the docker daemon is not
-# bound to the default communication port/socket
-# If the docker daemon is using a unix socket for communication your user
-# must have access to the socket for the completions to function correctly
-#
-# Note for developers:
-# Please arrange options sorted alphabetically by long name with the short
-# options immediately following their corresponding long form.
-# This order should be applied to lists, alternatives and code blocks.
-
-__docker_previous_extglob_setting=$(shopt -p extglob)
-shopt -s extglob
-
-__docker_q() {
-	docker ${host:+--host "$host"} ${config:+--config "$config"} ${context:+--context "$context"} 2>/dev/null "$@"
-}
-
-# __docker_configs returns a list of configs. Additional options to
-# `docker config ls` may be specified in order to filter the list, e.g.
-# `__docker_configs --filter label=stage=production`.
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_CONFIG_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_configs() {
-	local format
-	if [ "$1" = "--id" ] ; then
-		format='{{.ID}}'
-		shift
-	elif [ "$1" = "--name" ] ; then
-		format='{{.Name}}'
-		shift
-	elif [ "$DOCKER_COMPLETION_SHOW_CONFIG_IDS" = yes ] ; then
-		format='{{.ID}} {{.Name}}'
-	else
-		format='{{.Name}}'
-	fi
-
-	__docker_q config ls --format "$format" "$@"
-}
-
-# __docker_complete_configs applies completion of configs based on the current value
-# of `$cur` or the value of the optional first option `--cur`, if given.
-__docker_complete_configs() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_configs "$@")" -- "$current") )
-}
-
-# __docker_containers returns a list of containers. Additional options to
-# `docker ps` may be specified in order to filter the list, e.g.
-# `__docker_containers --filter status=running`
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_CONTAINER_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_containers() {
-	local format
-	if [ "$1" = "--id" ] ; then
-		format='{{.ID}}'
-		shift
-	elif [ "$1" = "--name" ] ; then
-		format='{{.Names}}'
-		shift
-	elif [ "${DOCKER_COMPLETION_SHOW_CONTAINER_IDS}" = yes ] ; then
-		format='{{.ID}} {{.Names}}'
-	else
-		format='{{.Names}}'
-	fi
-	__docker_q ps --format "$format" "$@"
-}
-
-# __docker_complete_containers applies completion of containers based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_containers`.
-__docker_complete_containers() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_containers "$@")" -- "$current") )
-}
-
-__docker_complete_containers_all() {
-	__docker_complete_containers "$@" --all
-}
-
-# shellcheck disable=SC2120
-__docker_complete_containers_removable() {
-	__docker_complete_containers "$@" --filter status=created --filter status=exited
-}
-
-__docker_complete_containers_running() {
-	__docker_complete_containers "$@" --filter status=running
-}
-
-# shellcheck disable=SC2120
-__docker_complete_containers_stoppable() {
-	__docker_complete_containers "$@" --filter status=running --filter status=paused
-}
-
-# shellcheck disable=SC2120
-__docker_complete_containers_stopped() {
-	__docker_complete_containers "$@" --filter status=exited
-}
-
-# shellcheck disable=SC2120
-__docker_complete_containers_unpauseable() {
-	__docker_complete_containers "$@" --filter status=paused
-}
-
-__docker_complete_container_names() {
-	local containers=( $(__docker_q ps -aq --no-trunc) )
-	local names=( $(__docker_q inspect --format '{{.Name}}' "${containers[@]}") )
-	names=( "${names[@]#/}" ) # trim off the leading "/" from the container names
-	COMPREPLY=( $(compgen -W "${names[*]}" -- "$cur") )
-}
-
-__docker_complete_container_ids() {
-	local containers=( $(__docker_q ps -aq) )
-	COMPREPLY=( $(compgen -W "${containers[*]}" -- "$cur") )
-}
-
-# __docker_contexts returns a list of contexts without the special "default" context.
-# Completions may be added with `--add`, e.g. `--add default`.
-__docker_contexts() {
-	local add=()
-	while true ; do
-		case "$1" in
-			--add)
-				add+=("$2")
-				shift 2
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-	__docker_q context ls -q
-	echo "${add[@]}"
-}
-
-__docker_complete_contexts() {
-	local contexts=( $(__docker_contexts "$@") )
-	COMPREPLY=( $(compgen -W "${contexts[*]}" -- "$cur") )
-}
-
-
-# __docker_images returns a list of images. For each image, up to three representations
-# can be generated: the repository (e.g. busybox), repository:tag (e.g. busybox:latest)
-# and the ID (e.g. sha256:ee22cbbd4ea3dff63c86ba60c7691287c321e93adfc1009604eb1dde7ec88645).
-#
-# The optional arguments `--repo`, `--tag` and `--id` select the representations that
-# may be returned. Whether or not a particular representation is actually returned
-# depends on the user's customization through several environment variables:
-# - image IDs are only shown if DOCKER_COMPLETION_SHOW_IMAGE_IDS=all|non-intermediate.
-# - tags can be excluded by setting DOCKER_COMPLETION_SHOW_TAGS=no.
-# - repositories are always shown.
-#
-# In cases where an exact image specification is needed, `--force-tag` can be used.
-# It ignores DOCKER_COMPLETION_SHOW_TAGS and only lists valid repository:tag combinations,
-# avoiding repository names that would default to a potentially missing default tag.
-#
-# Additional arguments to `docker image ls` may be specified in order to filter the list,
-# e.g. `__docker_images --filter dangling=true`.
-#
-__docker_images() {
-	local repo_format='{{.Repository}}'
-	local tag_format='{{.Repository}}:{{.Tag}}'
-	local id_format='{{.ID}}'
-	local all
-	local format
-
-	if [ "$DOCKER_COMPLETION_SHOW_IMAGE_IDS" = "all" ] ; then
-		all='--all'
-	fi
-
-	while true ; do
-		case "$1" in
-			--repo)
-				format+="$repo_format\n"
-				shift
-				;;
-			--tag)
-				if [ "${DOCKER_COMPLETION_SHOW_TAGS:-yes}" = "yes" ]; then
-					format+="$tag_format\n"
-				fi
-				shift
-				;;
-			--id)
-				if [[ $DOCKER_COMPLETION_SHOW_IMAGE_IDS =~ ^(all|non-intermediate)$ ]] ; then
-					format+="$id_format\n"
-				fi
-				shift
-				;;
-			--force-tag)
-				# like `--tag` but ignores environment setting
-				format+="$tag_format\n"
-				shift
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	__docker_q image ls --no-trunc --format "${format%\\n}" $all "$@" | grep -v '<none>$'
-}
-
-# __docker_complete_images applies completion of images based on the current value of `$cur` or
-# the value of the optional first option `--cur`, if given.
-# See __docker_images for customization of the returned items.
-__docker_complete_images() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_images "$@")" -- "$current") )
-	__ltrim_colon_completions "$current"
-}
-
-# __docker_networks returns a list of all networks. Additional options to
-# `docker network ls` may be specified in order to filter the list, e.g.
-# `__docker_networks --filter type=custom`
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_NETWORK_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_networks() {
-	local format
-	if [ "$1" = "--id" ] ; then
-		format='{{.ID}}'
-		shift
-	elif [ "$1" = "--name" ] ; then
-		format='{{.Name}}'
-		shift
-	elif [ "${DOCKER_COMPLETION_SHOW_NETWORK_IDS}" = yes ] ; then
-		format='{{.ID}} {{.Name}}'
-	else
-		format='{{.Name}}'
-	fi
-	__docker_q network ls --format "$format" "$@"
-}
-
-# __docker_complete_networks applies completion of networks based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_networks`.
-__docker_complete_networks() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_networks "$@")" -- "$current") )
-}
-
-__docker_complete_containers_in_network() {
-	local containers=($(__docker_q network inspect -f '{{range $i, $c := .Containers}}{{$i}} {{$c.Name}} {{end}}' "$1"))
-	COMPREPLY=( $(compgen -W "${containers[*]}" -- "$cur") )
-}
-
-# __docker_volumes returns a list of all volumes. Additional options to
-# `docker volume ls` may be specified in order to filter the list, e.g.
-# `__docker_volumes --filter dangling=true`
-# Because volumes do not have IDs, this function does not distinguish between
-# IDs and names.
-__docker_volumes() {
-	__docker_q volume ls -q "$@"
-}
-
-# __docker_complete_volumes applies completion of volumes based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_volumes`.
-__docker_complete_volumes() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_volumes "$@")" -- "$current") )
-}
-
-# __docker_plugins_bundled returns a list of all plugins of a given type.
-# The type has to be specified with the mandatory option `--type`.
-# Valid types are: Network, Volume, Authorization.
-# Completions may be added or removed with `--add` and `--remove`
-# This function only deals with plugins that come bundled with Docker.
-# For plugins managed by `docker plugin`, see `__docker_plugins_installed`.
-__docker_plugins_bundled() {
-	local type add=() remove=()
-	while true ; do
-		case "$1" in
-			--type)
-				type="$2"
-				shift 2
-				;;
-			--add)
-				add+=("$2")
-				shift 2
-				;;
-			--remove)
-				remove+=("$2")
-				shift 2
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	local plugins=($(__docker_q info --format "{{range \$i, \$p := .Plugins.$type}}{{.}} {{end}}"))
-	for del in "${remove[@]}" ; do
-		plugins=(${plugins[@]/$del/})
-	done
-	echo "${plugins[@]}" "${add[@]}"
-}
-
-# __docker_complete_plugins_bundled applies completion of plugins based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# The plugin type has to be specified with the next option `--type`.
-# This function only deals with plugins that come bundled with Docker.
-# For completion of plugins managed by `docker plugin`, see
-# `__docker_complete_plugins_installed`.
-__docker_complete_plugins_bundled() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_plugins_bundled "$@")" -- "$current") )
-}
-
-# __docker_plugins_installed returns a list of all plugins that were installed with
-# the Docker plugin API.
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_PLUGIN_IDS=yes to also complete IDs.
-# Additional options to `docker plugin ls` may be specified in order to filter the list,
-# e.g. `__docker_plugins_installed --filter enabled=true`
-# For built-in pugins, see `__docker_plugins_bundled`.
-__docker_plugins_installed() {
-	local format
-	if [ "$DOCKER_COMPLETION_SHOW_PLUGIN_IDS" = yes ] ; then
-		format='{{.ID}} {{.Name}}'
-	else
-		format='{{.Name}}'
-	fi
-	__docker_q plugin ls --format "$format" "$@"
-}
-
-# __docker_complete_plugins_installed applies completion of plugins that were installed
-# with the Docker plugin API, based on the current value of `$cur` or the value of
-# the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_plugins_installed`.
-# For completion of built-in pugins, see `__docker_complete_plugins_bundled`.
-__docker_complete_plugins_installed() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_plugins_installed "$@")" -- "$current") )
-}
-
-__docker_runtimes() {
-	__docker_q info | sed -n 's/^Runtimes: \(.*\)/\1/p'
-}
-
-__docker_complete_runtimes() {
-	COMPREPLY=( $(compgen -W "$(__docker_runtimes)" -- "$cur") )
-}
-
-# __docker_secrets returns a list of secrets. Additional options to
-# `docker secret ls` may be specified in order to filter the list, e.g.
-# `__docker_secrets --filter label=stage=production`
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_SECRET_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_secrets() {
-	local format
-	if [ "$1" = "--id" ] ; then
-		format='{{.ID}}'
-		shift
-	elif [ "$1" = "--name" ] ; then
-		format='{{.Name}}'
-		shift
-	elif [ "$DOCKER_COMPLETION_SHOW_SECRET_IDS" = yes ] ; then
-		format='{{.ID}} {{.Name}}'
-	else
-		format='{{.Name}}'
-	fi
-
-	__docker_q secret ls --format "$format" "$@"
-}
-
-# __docker_complete_secrets applies completion of secrets based on the current value
-# of `$cur` or the value of the optional first option `--cur`, if given.
-__docker_complete_secrets() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_secrets "$@")" -- "$current") )
-}
-
-# __docker_stacks returns a list of all stacks.
-__docker_stacks() {
-	__docker_q stack ls | awk 'NR>1 {print $1}'
-}
-
-# __docker_complete_stacks applies completion of stacks based on the current value
-# of `$cur` or the value of the optional first option `--cur`, if given.
-__docker_complete_stacks() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_stacks "$@")" -- "$current") )
-}
-
-# __docker_nodes returns a list of all nodes. Additional options to
-# `docker node ls` may be specified in order to filter the list, e.g.
-# `__docker_nodes --filter role=manager`
-# By default, only node names are returned.
-# Set DOCKER_COMPLETION_SHOW_NODE_IDS=yes to also complete node IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-# Completions may be added with `--add`, e.g. `--add self`.
-__docker_nodes() {
-	local format
-	if [ "$DOCKER_COMPLETION_SHOW_NODE_IDS" = yes ] ; then
-		format='{{.ID}} {{.Hostname}}'
-	else
-		format='{{.Hostname}}'
-	fi
-
-	local add=()
-
-	while true ; do
-		case "$1" in
-			--id)
-				format='{{.ID}}'
-				shift
-				;;
-			--name)
-				format='{{.Hostname}}'
-				shift
-				;;
-			--add)
-				add+=("$2")
-				shift 2
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	echo "$(__docker_q node ls --format "$format" "$@")" "${add[@]}"
-}
-
-# __docker_complete_nodes applies completion of nodes based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_nodes`.
-__docker_complete_nodes() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_nodes "$@")" -- "$current") )
-}
-
-# __docker_services returns a list of all services. Additional options to
-# `docker service ls` may be specified in order to filter the list, e.g.
-# `__docker_services --filter name=xxx`
-# By default, only node names are returned.
-# Set DOCKER_COMPLETION_SHOW_SERVICE_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_services() {
-	local fields='$2'  # default: service name only
-	[ "${DOCKER_COMPLETION_SHOW_SERVICE_IDS}" = yes ] && fields='$1,$2' # ID & name
-
-	if [ "$1" = "--id" ] ; then
-		fields='$1' # IDs only
-		shift
-	elif [ "$1" = "--name" ] ; then
-		fields='$2' # names only
-		shift
-	fi
-        __docker_q service ls "$@" | awk "NR>1 {print $fields}"
-}
-
-# __docker_complete_services applies completion of services based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_services`.
-__docker_complete_services() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_services "$@")" -- "$current") )
-}
-
-# __docker_tasks returns a list of all task IDs.
-__docker_tasks() {
-	__docker_q service ps --format '{{.ID}}' ""
-}
-
-# __docker_complete_services_and_tasks applies completion of services and task IDs.
-# shellcheck disable=SC2120
-__docker_complete_services_and_tasks() {
-	COMPREPLY=( $(compgen -W "$(__docker_services "$@") $(__docker_tasks)" -- "$cur") )
-}
-
-# __docker_append_to_completions appends the word passed as an argument to every
-# word in `$COMPREPLY`.
-# Normally you do this with `compgen -S` while generating the completions.
-# This function allows you to append a suffix later. It allows you to use
-# the __docker_complete_XXX functions in cases where you need a suffix.
-__docker_append_to_completions() {
-	COMPREPLY=( ${COMPREPLY[@]/%/"$1"} )
-}
-
-# __docker_fetch_info fetches information about the configured Docker server and updates
-# several variables with the results.
-# The result is cached for the duration of one invocation of bash completion.
-__docker_fetch_info() {
-	if [ -z "$info_fetched" ] ; then
-		read -r client_experimental server_experimental server_os <<< "$(__docker_q version -f '{{.Client.Experimental}} {{.Server.Experimental}} {{.Server.Os}}')"
-		info_fetched=true
-	fi
-}
-
-# __docker_client_is_experimental tests whether the Docker cli is configured to support
-# experimental features. If so, the function exits with 0 (true).
-# Otherwise, or if the result cannot be determined, the exit value is 1 (false).
-__docker_client_is_experimental() {
-	__docker_fetch_info
-	[ "$client_experimental" = "true" ]
-}
-
-# __docker_server_is_experimental tests whether the currently configured Docker
-# server runs in experimental mode. If so, the function exits with 0 (true).
-# Otherwise, or if the result cannot be determined, the exit value is 1 (false).
-__docker_server_is_experimental() {
-	__docker_fetch_info
-	[ "$server_experimental" = "true" ]
-}
-
-# __docker_server_os_is tests whether the currently configured Docker server runs
-# on the operating system passed in as the first argument.
-# Known operating systems: linux, windows.
-__docker_server_os_is() {
-	local expected_os="$1"
-	__docker_fetch_info
-	[ "$server_os" = "$expected_os" ]
-}
-
-# __docker_stack_orchestrator_is tests whether the client is configured to use
-# the orchestrator that is passed in as the first argument.
-__docker_stack_orchestrator_is() {
-	case "$1" in
-		kubernetes)
-			if [ -z "$stack_orchestrator_is_kubernetes" ] ; then
-				__docker_q stack ls --help | grep -qe --namespace
-				stack_orchestrator_is_kubernetes=$?
-			fi
-			return $stack_orchestrator_is_kubernetes
-			;;
-		swarm)
-			if [ -z "$stack_orchestrator_is_swarm" ] ; then
-				__docker_q stack deploy --help | grep -qe "with-registry-auth"
-				stack_orchestrator_is_swarm=$?
-			fi
-			return $stack_orchestrator_is_swarm
-			;;
-		*)
-			return 1
-			;;
-
-	esac
-}
-
-# __docker_pos_first_nonflag finds the position of the first word that is neither
-# option nor an option's argument. If there are options that require arguments,
-# you should pass a glob describing those options, e.g. "--option1|-o|--option2"
-# Use this function to restrict completions to exact positions after the argument list.
-__docker_pos_first_nonflag() {
-	local argument_flags=$1
-
-	local counter=$((${subcommand_pos:-${command_pos}} + 1))
-	while [ "$counter" -le "$cword" ]; do
-		if [ -n "$argument_flags" ] && eval "case '${words[$counter]}' in $argument_flags) true ;; *) false ;; esac"; then
-			(( counter++ ))
-			# eat "=" in case of --option=arg syntax
-			[ "${words[$counter]}" = "=" ] && (( counter++ ))
-		else
-			case "${words[$counter]}" in
-				-*)
-					;;
-				*)
-					break
-					;;
-			esac
-		fi
-
-		# Bash splits words at "=", retaining "=" as a word, examples:
-		# "--debug=false" => 3 words, "--log-opt syslog-facility=daemon" => 4 words
-		while [ "${words[$counter + 1]}" = "=" ] ; do
-			counter=$(( counter + 2))
-		done
-
-		(( counter++ ))
-	done
-
-	echo $counter
-}
-
-# __docker_map_key_of_current_option returns `key` if we are currently completing the
-# value of a map option (`key=value`) which matches the extglob given as an argument.
-# This function is needed for key-specific completions.
-__docker_map_key_of_current_option() {
-	local glob="$1"
-
-	local key glob_pos
-	if [ "$cur" = "=" ] ; then        # key= case
-		key="$prev"
-		glob_pos=$((cword - 2))
-	elif [[ $cur == *=* ]] ; then     # key=value case (OSX)
-		key=${cur%=*}
-		glob_pos=$((cword - 1))
-	elif [ "$prev" = "=" ] ; then
-		key=${words[$cword - 2]}  # key=value case
-		glob_pos=$((cword - 3))
-	else
-		return
-	fi
-
-	[ "${words[$glob_pos]}" = "=" ] && ((glob_pos--))  # --option=key=value syntax
-
-	[[ ${words[$glob_pos]} == @($glob) ]] && echo "$key"
-}
-
-# __docker_value_of_option returns the value of the first option matching `option_glob`.
-# Valid values for `option_glob` are option names like `--log-level` and globs like
-# `--log-level|-l`
-# Only positions between the command and the current word are considered.
-__docker_value_of_option() {
-	local option_extglob=$(__docker_to_extglob "$1")
-
-	local counter=$((command_pos + 1))
-	while [ "$counter" -lt "$cword" ]; do
-		case ${words[$counter]} in
-			$option_extglob )
-				echo "${words[$counter + 1]}"
-				break
-				;;
-		esac
-		(( counter++ ))
-	done
-}
-
-# __docker_to_alternatives transforms a multiline list of strings into a single line
-# string with the words separated by `|`.
-# This is used to prepare arguments to __docker_pos_first_nonflag().
-__docker_to_alternatives() {
-	local parts=( $1 )
-	local IFS='|'
-	echo "${parts[*]}"
-}
-
-# __docker_to_extglob transforms a multiline list of options into an extglob pattern
-# suitable for use in case statements.
-__docker_to_extglob() {
-	local extglob=$( __docker_to_alternatives "$1" )
-	echo "@($extglob)"
-}
-
-# __docker_subcommands processes subcommands
-# Locates the first occurrence of any of the subcommands contained in the
-# first argument. In case of a match, calls the corresponding completion
-# function and returns 0.
-# If no match is found, 1 is returned. The calling function can then
-# continue processing its completion.
-#
-# TODO if the preceding command has options that accept arguments and an
-# argument is equal ot one of the subcommands, this is falsely detected as
-# a match.
-__docker_subcommands() {
-	local subcommands="$1"
-
-	local counter=$((command_pos + 1))
-	while [ "$counter" -lt "$cword" ]; do
-		case "${words[$counter]}" in
-			$(__docker_to_extglob "$subcommands") )
-				subcommand_pos=$counter
-				local subcommand=${words[$counter]}
-				local completions_func=_docker_${command}_${subcommand//-/_}
-				declare -F "$completions_func" >/dev/null && "$completions_func"
-				return 0
-				;;
-		esac
-		(( counter++ ))
-	done
-	return 1
-}
-
-# __docker_nospace suppresses trailing whitespace
-__docker_nospace() {
-	# compopt is not available in ancient bash versions
-	type compopt &>/dev/null && compopt -o nospace
-}
-
-__docker_complete_resolved_hostname() {
-	command -v host >/dev/null 2>&1 || return
-	COMPREPLY=( $(host 2>/dev/null "${cur%:}" | awk '/has address/ {print $4}') )
-}
-
-# __docker_local_interfaces returns a list of the names and addresses of all
-# local network interfaces.
-# If `--ip-only` is passed as a first argument, only addresses are returned.
-__docker_local_interfaces() {
-	command -v ip >/dev/null 2>&1 || return
-
-	local format
-	if [ "$1" = "--ip-only" ] ; then
-		format='\1'
-		shift
-	else
-		 format='\1 \2'
-	fi
-
-	ip addr show scope global 2>/dev/null | sed -n "s| \+inet \([0-9.]\+\).* \([^ ]\+\)|$format|p"
-}
-
-# __docker_complete_local_interfaces applies completion of the names and addresses of all
-# local network interfaces based on the current value of `$cur`.
-# An additional value can be added to the possible completions with an `--add` argument.
-__docker_complete_local_interfaces() {
-	local additional_interface
-	if [ "$1" = "--add" ] ; then
-		additional_interface="$2"
-		shift 2
-	fi
-
-	COMPREPLY=( $( compgen -W "$(__docker_local_interfaces "$@") $additional_interface" -- "$cur" ) )
-}
-
-# __docker_complete_local_ips applies completion of the addresses of all local network
-# interfaces based on the current value of `$cur`.
-__docker_complete_local_ips() {
-	__docker_complete_local_interfaces --ip-only
-}
-
-# __docker_complete_capabilities_addable completes Linux capabilities which are
-# not granted by default and may be added.
-# see https://docs.docker.com/engine/reference/run/#/runtime-privilege-and-linux-capabilities
-__docker_complete_capabilities_addable() {
-	COMPREPLY=( $( compgen -W "
-		ALL
-		AUDIT_CONTROL
-		BLOCK_SUSPEND
-		DAC_READ_SEARCH
-		IPC_LOCK
-		IPC_OWNER
-		LEASE
-		LINUX_IMMUTABLE
-		MAC_ADMIN
-		MAC_OVERRIDE
-		NET_ADMIN
-		NET_BROADCAST
-		SYS_ADMIN
-		SYS_BOOT
-		SYSLOG
-		SYS_MODULE
-		SYS_NICE
-		SYS_PACCT
-		SYS_PTRACE
-		SYS_RAWIO
-		SYS_RESOURCE
-		SYS_TIME
-		SYS_TTY_CONFIG
-		WAKE_ALARM
-	" -- "$cur" ) )
-}
-
-# __docker_complete_capabilities_droppable completes Linux capability options which are
-# allowed by default and can be dropped.
-# see https://docs.docker.com/engine/reference/run/#/runtime-privilege-and-linux-capabilities
-__docker_complete_capabilities_droppable() {
-	COMPREPLY=( $( compgen -W "
-		ALL
-		AUDIT_WRITE
-		CHOWN
-		DAC_OVERRIDE
-		FOWNER
-		FSETID
-		KILL
-		MKNOD
-		NET_BIND_SERVICE
-		NET_RAW
-		SETFCAP
-		SETGID
-		SETPCAP
-		SETUID
-		SYS_CHROOT
-	" -- "$cur" ) )
-}
-
-__docker_complete_detach_keys() {
-	case "$prev" in
-		--detach-keys)
-			case "$cur" in
-				*,)
-					COMPREPLY=( $( compgen -W "${cur}ctrl-" -- "$cur" ) )
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "ctrl-" -- "$cur" ) )
-					;;
-			esac
-
-			__docker_nospace
-			return
-			;;
-	esac
-	return 1
-}
-
-__docker_complete_isolation() {
-	COMPREPLY=( $( compgen -W "default hyperv process" -- "$cur" ) )
-}
-
-__docker_complete_log_drivers() {
-	COMPREPLY=( $( compgen -W "
-		awslogs
-		etwlogs
-		fluentd
-		gcplogs
-		gelf
-		journald
-		json-file
-		local
-		logentries
-		none
-		splunk
-		syslog
-	" -- "$cur" ) )
-}
-
-__docker_complete_log_options() {
-	# see repository docker/docker.github.io/engine/admin/logging/
-
-	# really global options, defined in https://github.com/moby/moby/blob/master/daemon/logger/factory.go
-	local common_options1="max-buffer-size mode"
-	# common options defined in https://github.com/moby/moby/blob/master/daemon/logger/loginfo.go
-	# but not implemented in all log drivers
-	local common_options2="env env-regex labels"
-
-	# awslogs does not implement the $common_options2.
-	local awslogs_options="$common_options1 awslogs-create-group awslogs-credentials-endpoint awslogs-datetime-format awslogs-group awslogs-multiline-pattern awslogs-region awslogs-stream tag"
-
-	local fluentd_options="$common_options1 $common_options2 fluentd-address fluentd-async-connect fluentd-buffer-limit fluentd-retry-wait fluentd-max-retries fluentd-sub-second-precision tag"
-	local gcplogs_options="$common_options1 $common_options2 gcp-log-cmd gcp-meta-id gcp-meta-name gcp-meta-zone gcp-project"
-	local gelf_options="$common_options1 $common_options2 gelf-address gelf-compression-level gelf-compression-type gelf-tcp-max-reconnect gelf-tcp-reconnect-delay tag"
-	local journald_options="$common_options1 $common_options2 tag"
-	local json_file_options="$common_options1 $common_options2 compress max-file max-size"
-	local local_options="$common_options1 compress max-file max-size"
-	local logentries_options="$common_options1 $common_options2 line-only logentries-token tag"
-	local splunk_options="$common_options1 $common_options2 splunk-caname splunk-capath splunk-format splunk-gzip splunk-gzip-level splunk-index splunk-insecureskipverify splunk-source splunk-sourcetype splunk-token splunk-url splunk-verify-connection tag"
-	local syslog_options="$common_options1 $common_options2 syslog-address syslog-facility syslog-format syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify tag"
-
-	local all_options="$fluentd_options $gcplogs_options $gelf_options $journald_options $logentries_options $json_file_options $syslog_options $splunk_options"
-
-	case $(__docker_value_of_option --log-driver) in
-		'')
-			COMPREPLY=( $( compgen -W "$all_options" -S = -- "$cur" ) )
-			;;
-		awslogs)
-			COMPREPLY=( $( compgen -W "$awslogs_options" -S = -- "$cur" ) )
-			;;
-		fluentd)
-			COMPREPLY=( $( compgen -W "$fluentd_options" -S = -- "$cur" ) )
-			;;
-		gcplogs)
-			COMPREPLY=( $( compgen -W "$gcplogs_options" -S = -- "$cur" ) )
-			;;
-		gelf)
-			COMPREPLY=( $( compgen -W "$gelf_options" -S = -- "$cur" ) )
-			;;
-		journald)
-			COMPREPLY=( $( compgen -W "$journald_options" -S = -- "$cur" ) )
-			;;
-		json-file)
-			COMPREPLY=( $( compgen -W "$json_file_options" -S = -- "$cur" ) )
-			;;
-		local)
-			COMPREPLY=( $( compgen -W "$local_options" -S = -- "$cur" ) )
-			;;
-		logentries)
-			COMPREPLY=( $( compgen -W "$logentries_options" -S = -- "$cur" ) )
-			;;
-		syslog)
-			COMPREPLY=( $( compgen -W "$syslog_options" -S = -- "$cur" ) )
-			;;
-		splunk)
-			COMPREPLY=( $( compgen -W "$splunk_options" -S = -- "$cur" ) )
-			;;
-		*)
-			return
-			;;
-	esac
-
-	__docker_nospace
-}
-
-__docker_complete_log_driver_options() {
-	local key=$(__docker_map_key_of_current_option '--log-opt')
-	case "$key" in
-		awslogs-create-group)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		awslogs-credentials-endpoint)
-			COMPREPLY=( $( compgen -W "/" -- "${cur##*=}" ) )
-			__docker_nospace
-			return
-			;;
-		compress|fluentd-async-connect)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		fluentd-sub-second-precision)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		gelf-address)
-			COMPREPLY=( $( compgen -W "tcp udp" -S "://" -- "${cur##*=}" ) )
-			__docker_nospace
-			return
-			;;
-		gelf-compression-level)
-			COMPREPLY=( $( compgen -W "1 2 3 4 5 6 7 8 9" -- "${cur##*=}" ) )
-			return
-			;;
-		gelf-compression-type)
-			COMPREPLY=( $( compgen -W "gzip none zlib" -- "${cur##*=}" ) )
-			return
-			;;
-		line-only)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		mode)
-			COMPREPLY=( $( compgen -W "blocking non-blocking" -- "${cur##*=}" ) )
-			return
-			;;
-		syslog-address)
-			COMPREPLY=( $( compgen -W "tcp:// tcp+tls:// udp:// unix://" -- "${cur##*=}" ) )
-			__docker_nospace
-			__ltrim_colon_completions "${cur}"
-			return
-			;;
-		syslog-facility)
-			COMPREPLY=( $( compgen -W "
-				auth
-				authpriv
-				cron
-				daemon
-				ftp
-				kern
-				local0
-				local1
-				local2
-				local3
-				local4
-				local5
-				local6
-				local7
-				lpr
-				mail
-				news
-				syslog
-				user
-				uucp
-			" -- "${cur##*=}" ) )
-			return
-			;;
-		syslog-format)
-			COMPREPLY=( $( compgen -W "rfc3164 rfc5424 rfc5424micro" -- "${cur##*=}" ) )
-			return
-			;;
-		syslog-tls-ca-cert|syslog-tls-cert|syslog-tls-key)
-			_filedir
-			return
-			;;
-		syslog-tls-skip-verify)
-			COMPREPLY=( $( compgen -W "true" -- "${cur##*=}" ) )
-			return
-			;;
-		splunk-url)
-			COMPREPLY=( $( compgen -W "http:// https://" -- "${cur##*=}" ) )
-			__docker_nospace
-			__ltrim_colon_completions "${cur}"
-			return
-			;;
-		splunk-gzip|splunk-insecureskipverify|splunk-verify-connection)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		splunk-format)
-			COMPREPLY=( $( compgen -W "inline json raw" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-	return 1
-}
-
-__docker_complete_log_levels() {
-	COMPREPLY=( $( compgen -W "debug info warn error fatal" -- "$cur" ) )
-}
-
-__docker_complete_restart() {
-	case "$prev" in
-		--restart)
-			case "$cur" in
-				on-failure:*)
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "always no on-failure on-failure: unless-stopped" -- "$cur") )
-					;;
-			esac
-			return
-			;;
-	esac
-	return 1
-}
-
-# __docker_complete_signals returns a subset of the available signals that is most likely
-# relevant in the context of docker containers
-__docker_complete_signals() {
-	local signals=(
-		SIGCONT
-		SIGHUP
-		SIGINT
-		SIGKILL
-		SIGQUIT
-		SIGSTOP
-		SIGTERM
-		SIGUSR1
-		SIGUSR2
-	)
-	COMPREPLY=( $( compgen -W "${signals[*]} ${signals[*]#SIG}" -- "$( echo "$cur" | tr '[:lower:]' '[:upper:]')" ) )
-}
-
-__docker_complete_stack_orchestrator_options() {
-	case "$prev" in
-		--kubeconfig)
-			_filedir
-			return 0
-			;;
-		--namespace)
-			return 0
-			;;
-		--orchestrator)
-			COMPREPLY=( $( compgen -W "all kubernetes swarm" -- "$cur") )
-			return 0
-			;;
-	esac
-	return 1
-}
-
-__docker_complete_user_group() {
-	if [[ $cur == *:* ]] ; then
-		COMPREPLY=( $(compgen -g -- "${cur#*:}") )
-	else
-		COMPREPLY=( $(compgen -u -S : -- "$cur") )
-		__docker_nospace
-	fi
-}
-
-_docker_docker() {
-	# global options that may appear after the docker command
-	local boolean_options="
-		$global_boolean_options
-		--help
-		--version -v
-	"
-
-	case "$prev" in
-		--config)
-			_filedir -d
-			return
-			;;
-		--context|-c)
-			__docker_complete_contexts
-			return
-			;;
-		--log-level|-l)
-			__docker_complete_log_levels
-			return
-			;;
-		$(__docker_to_extglob "$global_options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $global_options_with_args" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag "$(__docker_to_extglob "$global_options_with_args")" )
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_client_is_experimental && commands+=(${experimental_client_commands[*]})
-				__docker_server_is_experimental && commands+=(${experimental_server_commands[*]})
-				COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
-			fi
-			;;
-	esac
-}
-
-_docker_attach() {
-	_docker_container_attach
-}
-
-_docker_build() {
-	_docker_image_build
-}
-
-
-_docker_builder() {
-	local subcommands="
-		prune
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_builder_prune() {
-	case "$prev" in
-		--filter)
-			COMPREPLY=( $( compgen -S = -W "description id inuse parent private shared type until unused-for" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--keep-storage)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --filter --force -f --help --keep-storage" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_checkpoint() {
-	local subcommands="
-		create
-		ls
-		rm
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_checkpoint_create() {
-	case "$prev" in
-		--checkpoint-dir)
-			_filedir -d
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--checkpoint-dir --help --leave-running" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--checkpoint-dir')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_running
-			fi
-			;;
-	esac
-}
-
-_docker_checkpoint_ls() {
-	case "$prev" in
-		--checkpoint-dir)
-			_filedir -d
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--checkpoint-dir --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--checkpoint-dir')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_checkpoint_rm() {
-	case "$prev" in
-		--checkpoint-dir)
-			_filedir -d
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--checkpoint-dir --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--checkpoint-dir')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				COMPREPLY=( $( compgen -W "$(__docker_q checkpoint ls "$prev" | sed 1d)" -- "$cur" ) )
-			fi
-			;;
-	esac
-}
-
-
-_docker_config() {
-	local subcommands="
-		create
-		inspect
-		ls
-		rm
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_config_create() {
-	case "$prev" in
-		--label|-l)
-			return
-			;;
-		--template-driver)
-			COMPREPLY=( $( compgen -W "golang" -- "$cur" ) )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --label -l --template-driver" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--label|-l|--template-driver')
-			if [ "$cword" -eq "$((counter + 1))" ]; then
-				_filedir
-			fi
-			;;
-	esac
-}
-
-_docker_config_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_configs
-			;;
-	esac
-}
-
-_docker_config_list() {
-	_docker_config_ls
-}
-
-_docker_config_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_configs --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_configs --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "id label name" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format --filter -f --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_config_remove() {
-	_docker_config_rm
-}
-
-_docker_config_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_configs
-			;;
-	esac
-}
-
-
-_docker_container() {
-	local subcommands="
-		attach
-		commit
-		cp
-		create
-		diff
-		exec
-		export
-		inspect
-		kill
-		logs
-		ls
-		pause
-		port
-		prune
-		rename
-		restart
-		rm
-		run
-		start
-		stats
-		stop
-		top
-		unpause
-		update
-		wait
-	"
-	local aliases="
-		list
-		ps
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_container_attach() {
-	__docker_complete_detach_keys && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--detach-keys --help --no-stdin --sig-proxy=false" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--detach-keys')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_running
-			fi
-			;;
-	esac
-}
-
-_docker_container_commit() {
-	case "$prev" in
-		--author|-a|--change|-c|--message|-m)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--author -a --change -c --help --message -m --pause=false -p=false" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--author|-a|--change|-c|--message|-m')
-
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-				return
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				__docker_complete_images --repo --tag
-				return
-			fi
-			;;
-	esac
-}
-
-_docker_container_cp() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--archive -a --follow-link -L --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				case "$cur" in
-					*:)
-						return
-						;;
-					*)
-						# combined container and filename completion
-						_filedir
-						local files=( ${COMPREPLY[@]} )
-
-						__docker_complete_containers_all
-						COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-						local containers=( ${COMPREPLY[@]} )
-
-						COMPREPLY=( $( compgen -W "${files[*]} ${containers[*]}" -- "$cur" ) )
-						if [[ "${COMPREPLY[*]}" = *: ]]; then
-							__docker_nospace
-						fi
-						return
-						;;
-				esac
-			fi
-			(( counter++ ))
-
-			if [ "$cword" -eq "$counter" ]; then
-				if [ -e "$prev" ]; then
-					__docker_complete_containers_all
-					COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-					__docker_nospace
-				else
-					_filedir
-				fi
-				return
-			fi
-			;;
-	esac
-}
-
-_docker_container_create() {
-	_docker_container_run_and_create
-}
-
-_docker_container_diff() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_exec() {
-	__docker_complete_detach_keys && return
-
-	case "$prev" in
-		--env|-e)
-			# we do not append a "=" here because "-e VARNAME" is legal syntax, too
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--user|-u)
-			__docker_complete_user_group
-			return
-			;;
-		--workdir|-w)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--detach -d --detach-keys --env -e --help --interactive -i --privileged -t --tty -u --user --workdir -w" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_export() {
-	case "$prev" in
-		--output|-o)
-			_filedir
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --output -o" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_inspect() {
-	_docker_inspect --type container
-}
-
-_docker_container_kill() {
-	case "$prev" in
-		--signal|-s)
-			__docker_complete_signals
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --signal -s" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_logs() {
-	case "$prev" in
-		--since|--tail|--until)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--details --follow -f --help --since --tail --timestamps -t --until" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--since|--tail|--until')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_list() {
-	_docker_container_ls
-}
-
-_docker_container_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		ancestor)
-			__docker_complete_images --cur "${cur##*=}" --repo --tag --id
-			return
-			;;
-		before)
-			__docker_complete_containers_all --cur "${cur##*=}"
-			return
-			;;
-		expose|publish)
-			return
-			;;
-		id)
-			__docker_complete_containers_all --cur "${cur##*=}" --id
-			return
-			;;
-		health)
-			COMPREPLY=( $( compgen -W "healthy starting none unhealthy" -- "${cur##*=}" ) )
-			return
-			;;
-		is-task)
-			COMPREPLY=( $( compgen -W "true false" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_containers_all --cur "${cur##*=}" --name
-			return
-			;;
-		network)
-			__docker_complete_networks --cur "${cur##*=}"
-			return
-			;;
-		since)
-			__docker_complete_containers_all --cur "${cur##*=}"
-			return
-			;;
-		status)
-			COMPREPLY=( $( compgen -W "created dead exited paused restarting running removing" -- "${cur##*=}" ) )
-			return
-			;;
-		volume)
-			__docker_complete_volumes --cur "${cur##*=}"
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "ancestor before exited expose health id is-task label name network publish since status volume" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format|--last|-n)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --filter -f --format --help --last -n --latest -l --no-trunc --quiet -q --size -s" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_container_pause() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_port() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_prune() {
-	case "$prev" in
-		--filter)
-			COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --filter --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_container_ps() {
-	_docker_container_ls
-}
-
-_docker_container_rename() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_restart() {
-	case "$prev" in
-		--time|-t)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --time -t" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_all
-			;;
-	esac
-}
-
-_docker_container_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help --link -l --volumes -v" -- "$cur" ) )
-			;;
-		*)
-			for arg in "${COMP_WORDS[@]}"; do
-				case "$arg" in
-					--force|-f)
-						__docker_complete_containers_all
-						return
-						;;
-				esac
-			done
-			__docker_complete_containers_removable
-			;;
-	esac
-}
-
-_docker_container_run() {
-	_docker_container_run_and_create
-}
-
-# _docker_container_run_and_create is the combined completion for `_docker_container_run`
-# and `_docker_container_create`
-_docker_container_run_and_create() {
-	local options_with_args="
-		--add-host
-		--attach -a
-		--blkio-weight
-		--blkio-weight-device
-		--cap-add
-		--cap-drop
-		--cgroup-parent
-		--cidfile
-		--cpu-period
-		--cpu-quota
-		--cpu-rt-period
-		--cpu-rt-runtime
-		--cpuset-cpus
-		--cpus
-		--cpuset-mems
-		--cpu-shares -c
-		--device
-		--device-cgroup-rule
-		--device-read-bps
-		--device-read-iops
-		--device-write-bps
-		--device-write-iops
-		--dns
-		--dns-option
-		--dns-search
-		--domainname
-		--entrypoint
-		--env -e
-		--env-file
-		--expose
-		--group-add
-		--health-cmd
-		--health-interval
-		--health-retries
-		--health-start-period
-		--health-timeout
-		--hostname -h
-		--ip
-		--ip6
-		--ipc
-		--kernel-memory
-		--label-file
-		--label -l
-		--link
-		--link-local-ip
-		--log-driver
-		--log-opt
-		--mac-address
-		--memory -m
-		--memory-swap
-		--memory-swappiness
-		--memory-reservation
-		--mount
-		--name
-		--network
-		--network-alias
-		--oom-score-adj
-		--pid
-		--pids-limit
-		--publish -p
-		--restart
-		--runtime
-		--security-opt
-		--shm-size
-		--stop-signal
-		--stop-timeout
-		--storage-opt
-		--tmpfs
-		--sysctl
-		--ulimit
-		--user -u
-		--userns
-		--uts
-		--volume-driver
-		--volumes-from
-		--volume -v
-		--workdir -w
-	"
-	__docker_server_os_is windows && options_with_args+="
-		--cpu-count
-		--cpu-percent
-		--io-maxbandwidth
-		--io-maxiops
-		--isolation
-	"
-	__docker_server_is_experimental && options_with_args+="
-		--platform
-	"
-
-	local boolean_options="
-		--disable-content-trust=false
-		--help
-		--init
-		--interactive -i
-		--no-healthcheck
-		--oom-kill-disable
-		--privileged
-		--publish-all -P
-		--read-only
-		--tty -t
-	"
-
-	if [ "$command" = "run" ] || [ "$subcommand" = "run" ] ; then
-		options_with_args="$options_with_args
-			--detach-keys
-		"
-		boolean_options="$boolean_options
-			--detach -d
-			--rm
-			--sig-proxy=false
-		"
-		__docker_complete_detach_keys && return
-	fi
-
-	local all_options="$options_with_args $boolean_options"
-
-
-	__docker_complete_log_driver_options && return
-	__docker_complete_restart && return
-
-	local key=$(__docker_map_key_of_current_option '--security-opt')
-	case "$key" in
-		label)
-			[[ $cur == *: ]] && return
-			COMPREPLY=( $( compgen -W "user: role: type: level: disable" -- "${cur##*=}") )
-			if [ "${COMPREPLY[*]}" != "disable" ] ; then
-				__docker_nospace
-			fi
-			return
-			;;
-		seccomp)
-			local cur=${cur##*=}
-			_filedir
-			COMPREPLY+=( $( compgen -W "unconfined" -- "$cur" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--add-host)
-			case "$cur" in
-				*:)
-					__docker_complete_resolved_hostname
-					return
-					;;
-			esac
-			;;
-		--attach|-a)
-			COMPREPLY=( $( compgen -W 'stdin stdout stderr' -- "$cur" ) )
-			return
-			;;
-		--cap-add)
-			__docker_complete_capabilities_addable
-			return
-			;;
-		--cap-drop)
-			__docker_complete_capabilities_droppable
-			return
-			;;
-		--cidfile|--env-file|--label-file)
-			_filedir
-			return
-			;;
-		--device|--tmpfs|--volume|-v)
-			case "$cur" in
-				*:*)
-					# TODO somehow do _filedir for stuff inside the image, if it's already specified (which is also somewhat difficult to determine)
-					;;
-				'')
-					COMPREPLY=( $( compgen -W '/' -- "$cur" ) )
-					__docker_nospace
-					;;
-				/*)
-					_filedir
-					__docker_nospace
-					;;
-			esac
-			return
-			;;
-		--env|-e)
-			# we do not append a "=" here because "-e VARNAME" is legal syntax, too
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--ipc)
-			case "$cur" in
-				*:*)
-					cur="${cur#*:}"
-					__docker_complete_containers_running
-					;;
-				*)
-					COMPREPLY=( $( compgen -W 'none host private shareable container:' -- "$cur" ) )
-					if [ "${COMPREPLY[*]}" = "container:" ]; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--isolation)
-			if __docker_server_os_is windows ; then
-				__docker_complete_isolation
-				return
-			fi
-			;;
-		--link)
-			case "$cur" in
-				*:*)
-					;;
-				*)
-					__docker_complete_containers_running
-					COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-					__docker_nospace
-					;;
-			esac
-			return
-			;;
-		--log-driver)
-			__docker_complete_log_drivers
-			return
-			;;
-		--log-opt)
-			__docker_complete_log_options
-			return
-			;;
-		--network)
-			case "$cur" in
-				container:*)
-					__docker_complete_containers_all --cur "${cur#*:}"
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "$(__docker_plugins_bundled --type Network) $(__docker_networks) container:" -- "$cur") )
-					if [ "${COMPREPLY[*]}" = "container:" ] ; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--pid)
-			case "$cur" in
-				*:*)
-					__docker_complete_containers_running --cur "${cur#*:}"
-					;;
-				*)
-					COMPREPLY=( $( compgen -W 'host container:' -- "$cur" ) )
-					if [ "${COMPREPLY[*]}" = "container:" ]; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--runtime)
-			__docker_complete_runtimes
-			return
-			;;
-		--security-opt)
-			COMPREPLY=( $( compgen -W "apparmor= label= no-new-privileges seccomp=" -- "$cur") )
-			if [ "${COMPREPLY[*]}" != "no-new-privileges" ] ; then
-				__docker_nospace
-			fi
-			return
-			;;
-		--stop-signal)
-			__docker_complete_signals
-			return
-			;;
-		--storage-opt)
-			COMPREPLY=( $( compgen -W "size" -S = -- "$cur") )
-			__docker_nospace
-			return
-			;;
-		--user|-u)
-			__docker_complete_user_group
-			return
-			;;
-		--userns)
-			COMPREPLY=( $( compgen -W "host" -- "$cur" ) )
-			return
-			;;
-		--volume-driver)
-			__docker_complete_plugins_bundled --type Volume
-			return
-			;;
-		--volumes-from)
-			__docker_complete_containers_all
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$all_options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag "$( __docker_to_alternatives "$options_with_args" )" )
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --repo --tag --id
-			fi
-			;;
-	esac
-}
-
-_docker_container_start() {
-	__docker_complete_detach_keys && return
-	case "$prev" in
-		--checkpoint)
-			if __docker_server_is_experimental ; then
-				return
-			fi
-			;;
-		--checkpoint-dir)
-			if __docker_server_is_experimental ; then
-				_filedir -d
-				return
-			fi
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--attach -a --detach-keys --help --interactive -i"
-			__docker_server_is_experimental && options+=" --checkpoint --checkpoint-dir"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_stopped
-			;;
-	esac
-}
-
-_docker_container_stats() {
-	case "$prev" in
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --format --help --no-stream --no-trunc" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_stop() {
-	case "$prev" in
-		--time|-t)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --time -t" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_stoppable
-			;;
-	esac
-}
-
-_docker_container_top() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_running
-			fi
-			;;
-	esac
-}
-
-_docker_container_unpause() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_containers_unpauseable
-			fi
-			;;
-	esac
-}
-
-_docker_container_update() {
-	local options_with_args="
-		--blkio-weight
-		--cpu-period
-		--cpu-quota
-		--cpu-rt-period
-		--cpu-rt-runtime
-		--cpus
-		--cpuset-cpus
-		--cpuset-mems
-		--cpu-shares -c
-		--kernel-memory
-		--memory -m
-		--memory-reservation
-		--memory-swap
-		--pids-limit
-		--restart
-	"
-
-	local boolean_options="
-		--help
-	"
-
-	local all_options="$options_with_args $boolean_options"
-
-	__docker_complete_restart && return
-
-	case "$prev" in
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$all_options" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_all
-			;;
-	esac
-}
-
-_docker_container_wait() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_all
-			;;
-	esac
-}
-
-
-_docker_context() {
-	local subcommands="
-		create
-		export
-		import
-		inspect
-		ls
-		rm
-		update
-		use
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_context_create() {
-	case "$prev" in
-		--default-stack-orchestrator)
-			COMPREPLY=( $( compgen -W "all kubernetes swarm" -- "$cur" ) )
-			return
-			;;
-		--description|--docker|--kubernetes)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--default-stack-orchestrator --description --docker --help --kubernetes" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_context_export() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --kubeconfig" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_contexts
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				_filedir
-			fi
-			;;
-	esac
-}
-
-_docker_context_import() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				:
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				_filedir
-			fi
-			;;
-	esac
-}
-
-_docker_context_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_contexts
-			;;
-	esac
-}
-
-_docker_context_list() {
-	_docker_context_ls
-}
-
-_docker_context_ls() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_context_remove() {
-	_docker_context_rm
-}
-
-_docker_context_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_contexts
-			;;
-	esac
-}
-
-_docker_context_update() {
-	case "$prev" in
-		--default-stack-orchestrator)
-			COMPREPLY=( $( compgen -W "all kubernetes swarm" -- "$cur" ) )
-			return
-			;;
-		--description|--docker|--kubernetes)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--default-stack-orchestrator --description --docker --help --kubernetes" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_contexts
-			fi
-			;;
-	esac
-}
-
-_docker_context_use() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_contexts --add default
-			fi
-			;;
-	esac
-}
-
-
-_docker_commit() {
-	_docker_container_commit
-}
-
-_docker_cp() {
-	_docker_container_cp
-}
-
-_docker_create() {
-	_docker_container_create
-}
-
-_docker_daemon() {
-	local boolean_options="
-		$global_boolean_options
-		--experimental
-		--help
-		--icc=false
-		--init
-		--ip-forward=false
-		--ip-masq=false
-		--iptables=false
-		--ipv6
-		--live-restore
-		--no-new-privileges
-		--raw-logs
-		--selinux-enabled
-		--userland-proxy=false
-		--version -v
-	"
-	local options_with_args="
-		$global_options_with_args
-		--add-runtime
-		--allow-nondistributable-artifacts
-		--api-cors-header
-		--authorization-plugin
-		--bip
-		--bridge -b
-		--cgroup-parent
-		--cluster-advertise
-		--cluster-store
-		--cluster-store-opt
-		--config-file
-		--containerd
-		--cpu-rt-period
-		--cpu-rt-runtime
-		--data-root
-		--default-address-pool
-		--default-gateway
-		--default-gateway-v6
-		--default-runtime
-		--default-shm-size
-		--default-ulimit
-		--dns
-		--dns-search
-		--dns-opt
-		--exec-opt
-		--exec-root
-		--fixed-cidr
-		--fixed-cidr-v6
-		--group -G
-		--init-path
-		--insecure-registry
-		--ip
-		--label
-		--log-driver
-		--log-opt
-		--max-concurrent-downloads
-		--max-concurrent-uploads
-		--metrics-addr
-		--mtu
-		--network-control-plane-mtu
-		--node-generic-resource
-		--oom-score-adjust
-		--pidfile -p
-		--registry-mirror
-		--seccomp-profile
-		--shutdown-timeout
-		--storage-driver -s
-		--storage-opt
-		--swarm-default-advertise-addr
-		--userland-proxy-path
-		--userns-remap
-	"
-
-	__docker_complete_log_driver_options && return
-
- 	key=$(__docker_map_key_of_current_option '--cluster-store-opt')
- 	case "$key" in
- 		kv.*file)
-			cur=${cur##*=}
- 			_filedir
- 			return
- 			;;
- 	esac
-
- 	local key=$(__docker_map_key_of_current_option '--storage-opt')
- 	case "$key" in
- 		dm.blkdiscard|dm.override_udev_sync_check|dm.use_deferred_removal|dm.use_deferred_deletion)
- 			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
- 			return
- 			;;
-		dm.directlvm_device|dm.thinpooldev)
-			cur=${cur##*=}
-			_filedir
-			return
-			;;
-		dm.fs)
-			COMPREPLY=( $( compgen -W "ext4 xfs" -- "${cur##*=}" ) )
-			return
-			;;
-		dm.libdm_log_level)
-			COMPREPLY=( $( compgen -W "2 3 4 5 6 7" -- "${cur##*=}" ) )
-			return
-			;;
- 	esac
-
-	case "$prev" in
-		--authorization-plugin)
-			__docker_complete_plugins_bundled --type Authorization
-			return
-			;;
-		--cluster-store)
-			COMPREPLY=( $( compgen -W "consul etcd zk" -S "://" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--cluster-store-opt)
-			COMPREPLY=( $( compgen -W "discovery.heartbeat discovery.ttl kv.cacertfile kv.certfile kv.keyfile kv.path" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--config-file|--containerd|--init-path|--pidfile|-p|--tlscacert|--tlscert|--tlskey|--userland-proxy-path)
-			_filedir
-			return
-			;;
-		--exec-root|--data-root)
-			_filedir -d
-			return
-			;;
-		--log-driver)
-			__docker_complete_log_drivers
-			return
-			;;
-		--storage-driver|-s)
-			COMPREPLY=( $( compgen -W "aufs btrfs devicemapper overlay overlay2 vfs zfs" -- "$(echo "$cur" | tr '[:upper:]' '[:lower:]')" ) )
-			return
-			;;
-		--storage-opt)
-			local btrfs_options="btrfs.min_space"
-			local devicemapper_options="
-				dm.basesize
-				dm.blkdiscard
-				dm.blocksize
-				dm.directlvm_device
-				dm.fs
-				dm.libdm_log_level
-				dm.loopdatasize
-				dm.loopmetadatasize
-				dm.min_free_space
-				dm.mkfsarg
-				dm.mountopt
-				dm.override_udev_sync_check
-				dm.thinpooldev
-				dm.thinp_autoextend_percent
-				dm.thinp_autoextend_threshold
-				dm.thinp_metapercent
-				dm.thinp_percent
-				dm.use_deferred_deletion
-				dm.use_deferred_removal
-			"
-			local overlay2_options="overlay2.size"
-			local zfs_options="zfs.fsname"
-
-			local all_options="$btrfs_options $devicemapper_options $overlay2_options $zfs_options"
-
-			case $(__docker_value_of_option '--storage-driver|-s') in
-				'')
-					COMPREPLY=( $( compgen -W "$all_options" -S = -- "$cur" ) )
-					;;
-				btrfs)
-					COMPREPLY=( $( compgen -W "$btrfs_options" -S = -- "$cur" ) )
-					;;
-				devicemapper)
-					COMPREPLY=( $( compgen -W "$devicemapper_options" -S = -- "$cur" ) )
-					;;
-				overlay2)
-					COMPREPLY=( $( compgen -W "$overlay2_options" -S = -- "$cur" ) )
-					;;
-				zfs)
-					COMPREPLY=( $( compgen -W "$zfs_options" -S = -- "$cur" ) )
-					;;
-				*)
-					return
-					;;
-			esac
-			__docker_nospace
-			return
-			;;
-		--log-level|-l)
-			__docker_complete_log_levels
-			return
-			;;
-		--log-opt)
-			__docker_complete_log_options
-			return
-			;;
-		--metrics-addr)
-			__docker_complete_local_ips
-			__docker_append_to_completions ":"
-			__docker_nospace
-			return
-			;;
-		--seccomp-profile)
-			_filedir json
-			return
-			;;
-		--swarm-default-advertise-addr)
-			__docker_complete_local_interfaces
-			return
-			;;
-		--userns-remap)
-			__docker_complete_user_group
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_deploy() {
-	__docker_server_is_experimental && _docker_stack_deploy
-}
-
-_docker_diff() {
-	_docker_container_diff
-}
-
-
-_docker_engine() {
-	local subcommands="
-		activate
-		check
-		update
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_engine_activate() {
-	case "$prev" in
-		--containerd|--engine-image|--format|--license|--registry-prefix|--version)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--containerd --display-only --engine-image --format --help --license --quiet --registry-prefix --version" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_engine_check() {
-	case "$prev" in
-		--containerd|--engine-image|--format|--registry-prefix)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--containerd --downgrades --engine-image --format --help --pre-releases --quiet -q --registry-prefix --upgrades" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_engine_update() {
-	case "$prev" in
-		--containerd|--engine-image|--registry-prefix|--version)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--containerd --engine-image --help --registry-prefix --version" -- "$cur" ) )
-			;;
-	esac
-}
-
-
-_docker_events() {
-	_docker_system_events
-}
-
-_docker_exec() {
-	_docker_container_exec
-}
-
-_docker_export() {
-	_docker_container_export
-}
-
-_docker_help() {
-	local counter=$(__docker_pos_first_nonflag)
-	if [ "$cword" -eq "$counter" ]; then
-		COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
-	fi
-}
-
-_docker_history() {
-	_docker_image_history
-}
-
-
-_docker_image() {
-	local subcommands="
-		build
-		history
-		import
-		inspect
-		load
-		ls
-		prune
-		pull
-		push
-		rm
-		save
-		tag
-	"
-	local aliases="
-		images
-		list
-		remove
-		rmi
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_image_build() {
-	local options_with_args="
-		--add-host
-		--build-arg
-		--cache-from
-		--cgroup-parent
-		--cpuset-cpus
-		--cpuset-mems
-		--cpu-shares -c
-		--cpu-period
-		--cpu-quota
-		--file -f
-		--iidfile
-		--label
-		--memory -m
-		--memory-swap
-		--network
-		--shm-size
-		--tag -t
-		--target
-		--ulimit
-	"
-	__docker_server_os_is windows && options_with_args+="
-		--isolation
-	"
-
-	local boolean_options="
-		--compress
-		--disable-content-trust=false
-		--force-rm
-		--help
-		--no-cache
-		--pull
-		--quiet -q
-		--rm
-	"
-	if __docker_server_is_experimental ; then
-		options_with_args+="
-			--platform
-		"
-		boolean_options+="
-			--squash
-			--stream
-		"
-	fi
-
-	local all_options="$options_with_args $boolean_options"
-
-	case "$prev" in
-		--add-host)
-			case "$cur" in
-				*:)
-					__docker_complete_resolved_hostname
-					return
-					;;
-			esac
-			;;
-		--build-arg)
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--cache-from)
-			__docker_complete_images --repo --tag --id
-			return
-			;;
-		--file|-f|--iidfile)
-			_filedir
-			return
-			;;
-		--isolation)
-			if __docker_server_os_is windows ; then
-				__docker_complete_isolation
-				return
-			fi
-			;;
-		--network)
-			case "$cur" in
-				container:*)
-					__docker_complete_containers_all --cur "${cur#*:}"
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "$(__docker_plugins_bundled --type Network) $(__docker_networks) container:" -- "$cur") )
-					if [ "${COMPREPLY[*]}" = "container:" ] ; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--tag|-t)
-			__docker_complete_images --repo --tag
-			return
-			;;
-		--target)
-			local context_pos=$( __docker_pos_first_nonflag "$( __docker_to_alternatives "$options_with_args" )" )
-			local context="${words[$context_pos]}"
-			context="${context:-.}"
-
-			local file="$( __docker_value_of_option '--file|f' )"
-			local default_file="${context%/}/Dockerfile"
-			local dockerfile="${file:-$default_file}"
-
-			local targets="$( sed -n 's/^FROM .\+ AS \(.\+\)/\1/p' "$dockerfile" 2>/dev/null )"
-			COMPREPLY=( $( compgen -W "$targets" -- "$cur" ) )
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$all_options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag "$( __docker_to_alternatives "$options_with_args" )" )
-			if [ "$cword" -eq "$counter" ]; then
-				_filedir -d
-			fi
-			;;
-	esac
-}
-
-_docker_image_history() {
-	case "$prev" in
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format --help --human=false -H=false --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--format')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --force-tag --id
-			fi
-			;;
-	esac
-}
-
-_docker_image_images() {
-	_docker_image_ls
-}
-
-_docker_image_import() {
-	case "$prev" in
-		--change|-c|--message|-m|--platform)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--change -c --help --message -m"
-			__docker_server_is_experimental && options+=" --platform"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--change|-c|--message|-m')
-			if [ "$cword" -eq "$counter" ]; then
-				_filedir
-				return
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				__docker_complete_images --repo --tag
-				return
-			fi
-			;;
-	esac
-}
-
-_docker_image_inspect() {
-	_docker_inspect --type image
-}
-
-_docker_image_load() {
-	case "$prev" in
-		--input|-i|"<")
-			_filedir
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --input -i --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_image_list() {
-	_docker_image_ls
-}
-
-_docker_image_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		before|since)
-			__docker_complete_images --cur "${cur##*=}" --force-tag --id
-			return
-			;;
-		dangling)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		label)
-			return
-			;;
-		reference)
-			__docker_complete_images --cur "${cur##*=}" --repo --tag
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "before dangling label reference since" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-                --format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --digests --filter -f --format --help --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-		=)
-			return
-			;;
-		*)
-			__docker_complete_images --repo --tag
-			;;
-	esac
-}
-
-_docker_image_prune() {
-	case "$prev" in
-		--filter)
-			COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --force -f --filter --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_image_pull() {
-	case "$prev" in
-		--platform)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--all-tags -a --disable-content-trust=false --help --quiet -q"
-			__docker_server_is_experimental && options+=" --platform"
-
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag --platform)
-			if [ "$cword" -eq "$counter" ]; then
-				for arg in "${COMP_WORDS[@]}"; do
-					case "$arg" in
-						--all-tags|-a)
-							__docker_complete_images --repo
-							return
-							;;
-					esac
-				done
-				__docker_complete_images --repo --tag
-			fi
-			;;
-	esac
-}
-
-_docker_image_push() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--disable-content-trust=false --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --repo --tag
-			fi
-			;;
-	esac
-}
-
-_docker_image_remove() {
-	_docker_image_rm
-}
-
-_docker_image_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help --no-prune" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_images --force-tag --id
-			;;
-	esac
-}
-
-_docker_image_rmi() {
-	_docker_image_rm
-}
-
-_docker_image_save() {
-	case "$prev" in
-		--output|-o|">")
-			_filedir
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --output -o" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_images --repo --tag --id
-			;;
-	esac
-}
-
-_docker_image_tag() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --force-tag --id
-				return
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				__docker_complete_images --repo --tag
-				return
-			fi
-			;;
-	esac
-}
-
-
-_docker_images() {
-	_docker_image_ls
-}
-
-_docker_import() {
-	_docker_image_import
-}
-
-_docker_info() {
-	_docker_system_info
-}
-
-_docker_inspect() {
-	local preselected_type
-	local type
-
-	if [ "$1" = "--type" ] ; then
-		preselected_type=yes
-		type="$2"
-	else
-		type=$(__docker_value_of_option --type)
-	fi
-
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-		--type)
-			if [ -z "$preselected_type" ] ; then
-				COMPREPLY=( $( compgen -W "container image network node plugin secret service volume" -- "$cur" ) )
-				return
-			fi
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--format -f --help --size -s"
-			if [ -z "$preselected_type" ] ; then
-				options+=" --type"
-			fi
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			case "$type" in
-				'')
-					COMPREPLY=( $( compgen -W "
-						$(__docker_containers --all)
-						$(__docker_images --force-tag --id)
-						$(__docker_networks)
-						$(__docker_nodes)
-						$(__docker_plugins_installed)
-						$(__docker_secrets)
-						$(__docker_services)
-						$(__docker_volumes)
-					" -- "$cur" ) )
-					__ltrim_colon_completions "$cur"
-					;;
-				container)
-					__docker_complete_containers_all
-					;;
-				image)
-					__docker_complete_images --force-tag --id
-					;;
-				network)
-					__docker_complete_networks
-					;;
-				node)
-					__docker_complete_nodes
-					;;
-				plugin)
-					__docker_complete_plugins_installed
-					;;
-				secret)
-					__docker_complete_secrets
-					;;
-				service)
-					__docker_complete_services
-					;;
-				volume)
-					__docker_complete_volumes
-					;;
-			esac
-	esac
-}
-
-_docker_kill() {
-	_docker_container_kill
-}
-
-_docker_load() {
-	_docker_image_load
-}
-
-_docker_login() {
-	case "$prev" in
-		--password|-p|--username|-u)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --password -p --password-stdin --username -u" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_logout() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_logs() {
-	_docker_container_logs
-}
-
-_docker_network_connect() {
-	local options_with_args="
-		--alias
-		--ip
-		--ip6
-		--link
-		--link-local-ip
-	"
-
-	local boolean_options="
-		--help
-	"
-
-	case "$prev" in
-		--link)
-			case "$cur" in
-				*:*)
-					;;
-				*)
-					__docker_complete_containers_running
-					COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-					__docker_nospace
-					;;
-			esac
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag "$( __docker_to_alternatives "$options_with_args" )" )
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_networks
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_network_create() {
-	case "$prev" in
-		--aux-address|--gateway|--ip-range|--ipam-opt|--ipv6|--opt|-o|--subnet)
-			return
-			;;
-		--config-from)
-			__docker_complete_networks
-			return
-			;;
-		--driver|-d)
-			# remove drivers that allow one instance only, add drivers missing in `docker info`
-			__docker_complete_plugins_bundled --type Network --remove host --remove null --add macvlan
-			return
-			;;
-		--ipam-driver)
-			COMPREPLY=( $( compgen -W "default" -- "$cur" ) )
-			return
-			;;
-		--label)
-			return
-			;;
-		--scope)
-			COMPREPLY=( $( compgen -W "local swarm" -- "$cur" ) )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--attachable --aux-address --config-from --config-only --driver -d --gateway --help --ingress --internal --ip-range --ipam-driver --ipam-opt --ipv6 --label --opt -o --scope --subnet" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_network_disconnect() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_networks
-			elif [ "$cword" -eq "$((counter + 1))" ]; then
-				__docker_complete_containers_in_network "$prev"
-			fi
-			;;
-	esac
-}
-
-_docker_network_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --verbose" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_networks
-	esac
-}
-
-_docker_network_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		dangling)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		driver)
-			__docker_complete_plugins_bundled --cur "${cur##*=}" --type Network --add macvlan
-			return
-			;;
-		id)
-			__docker_complete_networks --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_networks --cur "${cur##*=}" --name
-			return
-			;;
-		scope)
-			COMPREPLY=( $( compgen -W "global local swarm" -- "${cur##*=}" ) )
-			return
-			;;
-		type)
-			COMPREPLY=( $( compgen -W "builtin custom" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "dangling driver id label name scope type" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_network_prune() {
-	case "$prev" in
-		--filter)
-			COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --filter --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_network_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_networks --filter type=custom
-	esac
-}
-
-_docker_network() {
-	local subcommands="
-		connect
-		create
-		disconnect
-		inspect
-		ls
-		prune
-		rm
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_service() {
-	local subcommands="
-		create
-		inspect
-		logs
-		ls
-		rm
-		rollback
-		scale
-		ps
-		update
-	"
-
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_service_create() {
-	_docker_service_update_and_create
-}
-
-_docker_service_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_services
-	esac
-}
-
-_docker_service_logs() {
-	case "$prev" in
-		--since|--tail)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--details --follow -f --help --no-resolve --no-task-ids --no-trunc --raw --since --tail --timestamps -t" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--since|--tail')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_services_and_tasks
-			fi
-			;;
-	esac
-}
-
-_docker_service_list() {
-	_docker_service_ls
-}
-
-_docker_service_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_services --cur "${cur##*=}" --id
-			return
-			;;
-		mode)
-			COMPREPLY=( $( compgen -W "global replicated" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "id label mode name" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_service_remove() {
-	_docker_service_rm
-}
-
-_docker_service_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_services
-	esac
-}
-
-_docker_service_rollback() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--detach -d --help --quit -q" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag )
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_services
-			fi
-			;;
-	esac
-}
-
-_docker_service_scale() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--detach -d --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_services
-			__docker_append_to_completions "="
-			__docker_nospace
-			;;
-	esac
-}
-
-_docker_service_ps() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		desired-state)
-			COMPREPLY=( $( compgen -W "accepted running shutdown" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-		node)
-			__docker_complete_nodes --cur "${cur##*=}" --add self
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "desired-state id name node" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --no-resolve --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_services
-			;;
-	esac
-}
-
-_docker_service_update() {
-	_docker_service_update_and_create
-}
-
-# _docker_service_update_and_create is the combined completion for `docker service create`
-# and `docker service update`
-_docker_service_update_and_create() {
-	local options_with_args="
-		--endpoint-mode
-		--entrypoint
-		--health-cmd
-		--health-interval
-		--health-retries
-		--health-start-period
-		--health-timeout
-		--hostname
-		--isolation
-		--limit-cpu
-		--limit-memory
-		--log-driver
-		--log-opt
-		--replicas
-		--replicas-max-per-node
-		--reserve-cpu
-		--reserve-memory
-		--restart-condition
-		--restart-delay
-		--restart-max-attempts
-		--restart-window
-		--rollback-delay
-		--rollback-failure-action
-		--rollback-max-failure-ratio
-		--rollback-monitor
-		--rollback-order
-		--rollback-parallelism
-		--stop-grace-period
-		--stop-signal
-		--update-delay
-		--update-failure-action
-		--update-max-failure-ratio
-		--update-monitor
-		--update-order
-		--update-parallelism
-		--user -u
-		--workdir -w
-	"
-	__docker_server_os_is windows && options_with_args+="
-		--credential-spec
-	"
-
-	local boolean_options="
-		--detach -d
-		--help
-		--init
-		--no-healthcheck
-		--no-resolve-image
-		--read-only
-		--tty -t
-		--with-registry-auth
-	"
-
-	__docker_complete_log_driver_options && return
-
-	if [ "$subcommand" = "create" ] ; then
-		options_with_args="$options_with_args
-			--config
-			--constraint
-			--container-label
-			--dns
-			--dns-option
-			--dns-search
-			--env -e
-			--env-file
-			--generic-resource
-			--group
-			--host
-			--label -l
-			--mode
-			--mount
-			--name
-			--network
-			--placement-pref
-			--publish -p
-			--secret
-			--sysctl
-		"
-
-		case "$prev" in
-			--env-file)
-				_filedir
-				return
-				;;
-			--mode)
-				COMPREPLY=( $( compgen -W "global replicated" -- "$cur" ) )
-				return
-				;;
-		esac
-	fi
-	if [ "$subcommand" = "update" ] ; then
-		options_with_args="$options_with_args
-			--args
-			--config-add
-			--config-rm
-			--constraint-add
-			--constraint-rm
-			--container-label-add
-			--container-label-rm
-			--dns-add
-			--dns-option-add
-			--dns-option-rm
-			--dns-rm
-			--dns-search-add
-			--dns-search-rm
-			--env-add
-			--env-rm
-			--generic-resource-add
-			--generic-resource-rm
-			--group-add
-			--group-rm
-			--host-add
-			--host-rm
-			--image
-			--label-add
-			--label-rm
-			--mount-add
-			--mount-rm
-			--network-add
-			--network-rm
-			--placement-pref-add
-			--placement-pref-rm
-			--publish-add
-			--publish-rm
-			--rollback
-			--secret-add
-			--secret-rm
-			--sysctl-add
-			--sysctl-rm
-		"
-
-		boolean_options="$boolean_options
-			--force
-		"
-
-		case "$prev" in
-			--env-rm)
-				COMPREPLY=( $( compgen -e -- "$cur" ) )
-				return
-				;;
-			--image)
-				__docker_complete_images --repo --tag --id
-				return
-				;;
-		esac
-	fi
-
-	local strategy=$(__docker_map_key_of_current_option '--placement-pref|--placement-pref-add|--placement-pref-rm')
-	case "$strategy" in
-		spread)
-			COMPREPLY=( $( compgen -W "engine.labels node.labels" -S . -- "${cur##*=}" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--config|--config-add|--config-rm)
-			__docker_complete_configs
-			return
-			;;
-		--endpoint-mode)
-			COMPREPLY=( $( compgen -W "dnsrr vip" -- "$cur" ) )
-			return
-			;;
-		--env|-e|--env-add)
-			# we do not append a "=" here because "-e VARNAME" is legal systax, too
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--group|--group-add|--group-rm)
-			COMPREPLY=( $(compgen -g -- "$cur") )
-			return
-			;;
-		--host|--host-add|--host-rm)
-			case "$cur" in
-				*:)
-					__docker_complete_resolved_hostname
-					return
-					;;
-			esac
-			;;
-		--isolation)
-			__docker_complete_isolation
-			return
-			;;
-		--log-driver)
-			__docker_complete_log_drivers
-			return
-			;;
-		--log-opt)
-			__docker_complete_log_options
-			return
-			;;
-		--network|--network-add|--network-rm)
-			__docker_complete_networks
-			return
-			;;
-		--placement-pref|--placement-pref-add|--placement-pref-rm)
-			COMPREPLY=( $( compgen -W "spread" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--restart-condition)
-			COMPREPLY=( $( compgen -W "any none on-failure" -- "$cur" ) )
-			return
-			;;
-		--rollback-failure-action)
-			COMPREPLY=( $( compgen -W "continue pause" -- "$cur" ) )
-			return
-			;;
-		--secret|--secret-add|--secret-rm)
-			__docker_complete_secrets
-			return
-			;;
-		--stop-signal)
-			__docker_complete_signals
-			return
-			;;
-		--update-failure-action)
-			COMPREPLY=( $( compgen -W "continue pause rollback" -- "$cur" ) )
-			return
-			;;
-		--update-order|--rollback-order)
-			COMPREPLY=( $( compgen -W "start-first stop-first" -- "$cur" ) )
-			return
-			;;
-		--user|-u)
-			__docker_complete_user_group
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag "$( __docker_to_alternatives "$options_with_args" )" )
-			if [ "$subcommand" = "update" ] ; then
-				if [ "$cword" -eq "$counter" ]; then
-					__docker_complete_services
-				fi
-			else
-				if [ "$cword" -eq "$counter" ]; then
-					__docker_complete_images --repo --tag --id
-				fi
-			fi
-			;;
-	esac
-}
-
-_docker_swarm() {
-	local subcommands="
-		ca
-		init
-		join
-		join-token
-		leave
-		unlock
-		unlock-key
-		update
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_ca() {
-	case "$prev" in
-		--ca-cert|--ca-key)
-			_filedir
-			return
-			;;
-		--cert-expiry|--external-ca)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--ca-cert --ca-key --cert-expiry --detach -d --external-ca --help --quiet -q --rotate" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_init() {
-	case "$prev" in
-		--advertise-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces
-				__docker_nospace
-			fi
-			return
-			;;
-		--availability)
-			COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) )
-			return
-			;;
-		--cert-expiry|--data-path-port|--default-addr-pool|--default-addr-pool-mask-length|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit )
-			return
-			;;
-		--data-path-addr)
-			__docker_complete_local_interfaces
-			return
-			;;
-		--listen-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces --add 0.0.0.0
-				__docker_nospace
-			fi
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--advertise-addr --autolock --availability --cert-expiry --data-path-addr --data-path-port --default-addr-pool --default-addr-pool-mask-length --dispatcher-heartbeat --external-ca --force-new-cluster --help --listen-addr --max-snapshots --snapshot-interval --task-history-limit " -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_join() {
-	case "$prev" in
-		--advertise-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces
-				__docker_nospace
-			fi
-			return
-			;;
-		--availability)
-			COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) )
-			return
-			;;
-		--data-path-addr)
-			__docker_complete_local_interfaces
-			return
-			;;
-		--listen-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces --add 0.0.0.0
-				__docker_nospace
-			fi
-			return
-			;;
-		--token)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--advertise-addr --availability --data-path-addr --help --listen-addr --token" -- "$cur" ) )
-			;;
-		*:)
-			COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			;;
-	esac
-}
-
-_docker_swarm_join_token() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --quiet -q --rotate" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag )
-			if [ "$cword" -eq "$counter" ]; then
-				COMPREPLY=( $( compgen -W "manager worker" -- "$cur" ) )
-			fi
-			;;
-	esac
-}
-
-_docker_swarm_leave() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_unlock() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_unlock_key() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --quiet -q --rotate" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_update() {
-	case "$prev" in
-		--cert-expiry|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--autolock --cert-expiry --dispatcher-heartbeat --external-ca --help --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_manifest() {
-	local subcommands="
-		annotate
-		create
-		inspect
-		push
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_manifest_annotate() {
-	case "$prev" in
-		--arch)
-			COMPREPLY=( $( compgen -W "
-				386
-				amd64
-				arm
-				arm64
-				mips64
-				mips64le
-				ppc64le
-				s390x" -- "$cur" ) )
-			return
-			;;
-		--os)
-			COMPREPLY=( $( compgen -W "
-				darwin
-				dragonfly
-				freebsd
-				linux
-				netbsd
-				openbsd
-				plan9
-				solaris
-				windows" -- "$cur" ) )
-			return
-			;;
-		--os-features|--variant)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--arch --help --os --os-features --variant" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag "--arch|--os|--os-features|--variant" )
-			if [ "$cword" -eq "$counter" ] || [ "$cword" -eq "$((counter + 1))" ]; then
-				__docker_complete_images --force-tag --id
-			fi
-			;;
-	esac
-}
-
-_docker_manifest_create() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--amend -a --help --insecure" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_images --force-tag --id
-			;;
-	esac
-}
-
-_docker_manifest_inspect() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --insecure --verbose -v" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag )
-			if [ "$cword" -eq "$counter" ] || [ "$cword" -eq "$((counter + 1))" ]; then
-				__docker_complete_images --force-tag --id
-			fi
-			;;
-	esac
-}
-
-_docker_manifest_push() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --insecure --purge -p" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag )
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --force-tag --id
-			fi
-			;;
-	esac
-}
-
-_docker_node() {
-	local subcommands="
-		demote
-		inspect
-		ls
-		promote
-		rm
-		ps
-		update
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_node_demote() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes --filter role=manager
-	esac
-}
-
-_docker_node_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes --add self
-	esac
-}
-
-_docker_node_list() {
-	_docker_node_ls
-}
-
-_docker_node_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_nodes --cur "${cur##*=}" --id
-			return
-			;;
-		membership)
-			COMPREPLY=( $( compgen -W "accepted pending" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_nodes --cur "${cur##*=}" --name
-			return
-			;;
-		role)
-			COMPREPLY=( $( compgen -W "manager worker" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "id label membership name role" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_node_promote() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes --filter role=worker
-	esac
-}
-
-_docker_node_remove() {
-	_docker_node_rm
-}
-
-_docker_node_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes
-	esac
-}
-
-_docker_node_ps() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		desired-state)
-			COMPREPLY=( $( compgen -W "accepted running shutdown" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "desired-state id label name" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --no-resolve --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes --add self
-			;;
-	esac
-}
-
-_docker_node_update() {
-	case "$prev" in
-		--availability)
-			COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) )
-			return
-			;;
-		--role)
-			COMPREPLY=( $( compgen -W "manager worker" -- "$cur" ) )
-			return
-			;;
-		--label-add|--label-rm)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--availability --help --label-add --label-rm --role" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--availability|--label-add|--label-rm|--role')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_nodes
-			fi
-			;;
-	esac
-}
-
-_docker_pause() {
-	_docker_container_pause
-}
-
-_docker_plugin() {
-	local subcommands="
-		create
-		disable
-		enable
-		inspect
-		install
-		ls
-		push
-		rm
-		set
-		upgrade
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_plugin_create() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--compress --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				# reponame
-				return
-			elif [ "$cword" -eq  "$((counter + 1))" ]; then
-				_filedir -d
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_disable() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_plugins_installed --filter enabled=true
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_enable() {
-	case "$prev" in
-		--timeout)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --timeout" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--timeout')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_plugins_installed --filter enabled=false
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_inspect() {
-	case "$prev" in
-		--format|f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_plugins_installed
-			;;
-	esac
-}
-
-_docker_plugin_install() {
-	case "$prev" in
-		--alias)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--alias --disable --disable-content-trust=false --grant-all-permissions --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_plugin_list() {
-	_docker_plugin_ls
-}
-
-_docker_plugin_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		capability)
-			COMPREPLY=( $( compgen -W "authz ipamdriver logdriver metricscollector networkdriver volumedriver" -- "${cur##*=}" ) )
-			return
-			;;
-		enabled)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "capability enabled" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_plugin_push() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_plugins_installed
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_remove() {
-	_docker_plugin_rm
-}
-
-_docker_plugin_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_plugins_installed
-			;;
-	esac
-}
-
-_docker_plugin_set() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_plugins_installed
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_upgrade() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--disable-content-trust --grant-all-permissions --help --skip-remote-check" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_plugins_installed
-				__ltrim_colon_completions "$cur"
-			elif [ "$cword" -eq  "$((counter + 1))" ]; then
-				local plugin_images="$(__docker_plugins_installed)"
-				COMPREPLY=( $(compgen -S : -W "${plugin_images%:*}" -- "$cur") )
-				__docker_nospace
-			fi
-			;;
-	esac
-}
-
-
-_docker_port() {
-	_docker_container_port
-}
-
-_docker_ps() {
-	_docker_container_ls
-}
-
-_docker_pull() {
-	_docker_image_pull
-}
-
-_docker_push() {
-	_docker_image_push
-}
-
-_docker_rename() {
-	_docker_container_rename
-}
-
-_docker_restart() {
-	_docker_container_restart
-}
-
-_docker_rm() {
-	_docker_container_rm
-}
-
-_docker_rmi() {
-	_docker_image_rm
-}
-
-_docker_run() {
-	_docker_container_run
-}
-
-_docker_save() {
-	_docker_image_save
-}
-
-
-_docker_secret() {
-	local subcommands="
-		create
-		inspect
-		ls
-		rm
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_secret_create() {
-	case "$prev" in
-		--driver|-d|--label|-l)
-			return
-			;;
-		--template-driver)
-			COMPREPLY=( $( compgen -W "golang" -- "$cur" ) )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--driver -d --help --label -l --template-driver" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--driver|-d|--label|-l|--template-driver')
-			if [ "$cword" -eq "$((counter + 1))" ]; then
-				_filedir
-			fi
-			;;
-	esac
-}
-
-_docker_secret_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_secrets
-			;;
-	esac
-}
-
-_docker_secret_list() {
-	_docker_secret_ls
-}
-
-_docker_secret_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_secrets --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_secrets --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "id label name" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format --filter -f --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_secret_remove() {
-	_docker_secret_rm
-}
-
-_docker_secret_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_secrets
-			;;
-	esac
-}
-
-
-
-_docker_search() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		is-automated)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		is-official)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "is-automated is-official stars" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format|--limit)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --limit --no-trunc" -- "$cur" ) )
-			;;
-	esac
-}
-
-
-_docker_stack() {
-	local subcommands="
-		deploy
-		ls
-		ps
-		rm
-		services
-	"
-	local aliases="
-		down
-		list
-		remove
-		up
-	"
-
-	__docker_complete_stack_orchestrator_options && return
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			local options="--help --orchestrator"
-			__docker_stack_orchestrator_is kubernetes && options+=" --kubeconfig"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_stack_deploy() {
-	__docker_complete_stack_orchestrator_options && return
-
-	case "$prev" in
-		--bundle-file)
-			_filedir dab
-			return
-			;;
-		--compose-file|-c)
-			_filedir yml
-			return
-			;;
-		--resolve-image)
-			COMPREPLY=( $( compgen -W "always changed never" -- "$cur" ) )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--compose-file -c --help --orchestrator"
-			__docker_server_is_experimental && __docker_stack_orchestrator_is swarm && options+=" --bundle-file"
-			__docker_stack_orchestrator_is kubernetes && options+=" --kubeconfig --namespace"
-			__docker_stack_orchestrator_is swarm && options+=" --prune --resolve-image --with-registry-auth"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--bundle-file|--compose-file|-c|--kubeconfig|--namespace|--orchestrator|--resolve-image')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_stacks
-			fi
-			;;
-	esac
-}
-
-_docker_stack_down() {
-	_docker_stack_rm
-}
-
-_docker_stack_list() {
-	_docker_stack_ls
-}
-
-_docker_stack_ls() {
-	__docker_complete_stack_orchestrator_options && return
-
-	case "$prev" in
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--format --help --orchestrator"
-			__docker_stack_orchestrator_is kubernetes && options+=" --all-namespaces --kubeconfig --namespace"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_stack_ps() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		desired-state)
-			COMPREPLY=( $( compgen -W "accepted running shutdown" -- "${cur##*=}" ) )
-			return
-			;;
-		id)
-			__docker_complete_stacks --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_stacks --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	__docker_complete_stack_orchestrator_options && return
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "id name desired-state" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--filter -f --format --help --no-resolve --no-trunc --orchestrator --quiet -q"
-			__docker_stack_orchestrator_is kubernetes && options+=" --all-namespaces --kubeconfig --namespace"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--all-namespaces|--filter|-f|--format|--kubeconfig|--namespace')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_stacks
-			fi
-			;;
-	esac
-}
-
-_docker_stack_remove() {
-	_docker_stack_rm
-}
-
-_docker_stack_rm() {
-	__docker_complete_stack_orchestrator_options && return
-
-	case "$cur" in
-		-*)
-			local options="--help --orchestrator"
-			__docker_stack_orchestrator_is kubernetes && options+=" --kubeconfig --namespace"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_stacks
-			;;
-	esac
-}
-
-_docker_stack_services() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_services --cur "${cur##*=}" --id
-			return
-			;;
-		label)
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	__docker_complete_stack_orchestrator_options && return
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "id label name" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--filter -f --format --help --orchestrator --quiet -q"
-			__docker_stack_orchestrator_is kubernetes && options+=" --kubeconfig --namespace"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--filter|-f|--format|--kubeconfig|--namespace|--orchestrator')
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_stacks
-			fi
-			;;
-	esac
-}
-
-_docker_stack_up() {
-	_docker_stack_deploy
-}
-
-
-_docker_start() {
-	_docker_container_start
-}
-
-_docker_stats() {
-	_docker_container_stats
-}
-
-_docker_stop() {
-	_docker_container_stop
-}
-
-
-_docker_system() {
-	local subcommands="
-		df
-		events
-		info
-		prune
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_df() {
-	case "$prev" in
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format --help --verbose -v" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_events() {
-	local key=$(__docker_map_key_of_current_option '-f|--filter')
-	case "$key" in
-		container)
-			__docker_complete_containers_all --cur "${cur##*=}"
-			return
-			;;
-		daemon)
-			local name=$(__docker_q info | sed -n 's/^\(ID\|Name\): //p')
-			COMPREPLY=( $( compgen -W "$name" -- "${cur##*=}" ) )
-			return
-			;;
-		event)
-			COMPREPLY=( $( compgen -W "
-				attach
-				commit
-				connect
-				copy
-				create
-				delete
-				destroy
-				detach
-				die
-				disable
-				disconnect
-				enable
-				exec_create
-				exec_detach
-				exec_die
-				exec_start
-				export
-				health_status
-				import
-				install
-				kill
-				load
-				mount
-				oom
-				pause
-				pull
-				push
-				reload
-				remove
-				rename
-				resize
-				restart
-				save
-				start
-				stop
-				tag
-				top
-				unmount
-				unpause
-				untag
-				update
-			" -- "${cur##*=}" ) )
-			return
-			;;
-		image)
-			__docker_complete_images --cur "${cur##*=}" --repo --tag
-			return
-			;;
-		network)
-			__docker_complete_networks --cur "${cur##*=}"
-			return
-			;;
-		scope)
-			COMPREPLY=( $( compgen -W "local swarm" -- "${cur##*=}" ) )
-			return
-			;;
-		type)
-			COMPREPLY=( $( compgen -W "config container daemon image network plugin secret service volume" -- "${cur##*=}" ) )
-			return
-			;;
-		volume)
-			__docker_complete_volumes --cur "${cur##*=}"
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "container daemon event image label network scope type volume" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--since|--until)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --since --until --format" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_info() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_prune() {
-	case "$prev" in
-		--filter)
-			COMPREPLY=( $( compgen -W "label label! until" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --force -f --filter --help --volumes" -- "$cur" ) )
-			;;
-	esac
-}
-
-
-_docker_tag() {
-	_docker_image_tag
-}
-
-
-_docker_trust() {
-	local subcommands="
-		inspect
-		revoke
-		sign
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_trust_inspect() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --pretty" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --repo --tag
-			fi
-			;;
-	esac
-}
-
-_docker_trust_revoke() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --yes -y" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --repo --tag
-			fi
-			;;
-	esac
-}
-
-_docker_trust_sign() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --local" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ "$cword" -eq "$counter" ]; then
-				__docker_complete_images --force-tag --id
-			fi
-			;;
-	esac
-}
-
-
-_docker_unpause() {
-	_docker_container_unpause
-}
-
-_docker_update() {
-	_docker_container_update
-}
-
-_docker_top() {
-	_docker_container_top
-}
-
-_docker_version() {
-	__docker_complete_stack_orchestrator_options && return
-
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--format -f --help"
-			__docker_stack_orchestrator_is kubernetes && options+=" --kubeconfig"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_create() {
-	case "$prev" in
-		--driver|-d)
-			__docker_complete_plugins_bundled --type Volume
-			return
-			;;
-		--label|--opt|-o)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--driver -d --help --label --opt -o" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_volumes
-			;;
-	esac
-}
-
-_docker_volume_list() {
-	_docker_volume_ls
-}
-
-_docker_volume_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		dangling)
-			COMPREPLY=( $( compgen -W "true false" -- "${cur##*=}" ) )
-			return
-			;;
-		driver)
-			__docker_complete_plugins_bundled --cur "${cur##*=}" --type Volume
-			return
-			;;
-		name)
-			__docker_complete_volumes --cur "${cur##*=}"
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "dangling driver label name" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_prune() {
-	case "$prev" in
-		--filter)
-			COMPREPLY=( $( compgen -W "label label!" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter --force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_remove() {
-	_docker_volume_rm
-}
-
-_docker_volume_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_volumes
-			;;
-	esac
-}
-
-_docker_volume() {
-	local subcommands="
-		create
-		inspect
-		ls
-		prune
-		rm
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_wait() {
-	_docker_container_wait
-}
-
-_docker() {
-	local previous_extglob_setting=$(shopt -p extglob)
-	shopt -s extglob
-
-	local management_commands=(
-		builder
-		config
-		container
-		context
-		engine
-		image
-		network
-		node
-		plugin
-		secret
-		service
-		stack
-		swarm
-		system
-		trust
-		volume
-	)
-
-	local top_level_commands=(
-		build
-		login
-		logout
-		run
-		search
-		version
-	)
-
-	local legacy_commands=(
-		attach
-		commit
-		cp
-		create
-		diff
-		events
-		exec
-		export
-		history
-		images
-		import
-		info
-		inspect
-		kill
-		load
-		logs
-		pause
-		port
-		ps
-		pull
-		push
-		rename
-		restart
-		rm
-		rmi
-		save
-		start
-		stats
-		stop
-		tag
-		top
-		unpause
-		update
-		wait
-	)
-
-	local experimental_client_commands=(
-		manifest
-	)
-
-	local experimental_server_commands=(
-		checkpoint
-		deploy
-	)
-
-	local commands=(${management_commands[*]} ${top_level_commands[*]})
-	[ -z "$DOCKER_HIDE_LEGACY_COMMANDS" ] && commands+=(${legacy_commands[*]})
-
-	# These options are valid as global options for all client commands
-	# and valid as command options for `docker daemon`
-	local global_boolean_options="
-		--debug -D
-		--tls
-		--tlsverify
-	"
-	local global_options_with_args="
-		--config
-		--context -c
-		--host -H
-		--log-level -l
-		--tlscacert
-		--tlscert
-		--tlskey
-	"
-
-	# variables to cache server info, populated on demand for performance reasons
-	local info_fetched server_experimental server_os
-	# variables to cache client info, populated on demand for performance reasons
-	local client_experimental stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm
-
-	local host config context
-
-	COMPREPLY=()
-	local cur prev words cword
-	_get_comp_words_by_ref -n : cur prev words cword
-
-	local command='docker' command_pos=0 subcommand_pos
-	local counter=1
-	while [ "$counter" -lt "$cword" ]; do
-		case "${words[$counter]}" in
-			docker)
-				return 0
-				;;
-			# save host so that completion can use custom daemon
-			--host|-H)
-				(( counter++ ))
-				host="${words[$counter]}"
-				;;
-			# save config so that completion can use custom configuration directories
-			--config)
-				(( counter++ ))
-				config="${words[$counter]}"
-				;;
-			# save context so that completion can use custom daemon
-			--context|-c)
-				(( counter++ ))
-				context="${words[$counter]}"
-				;;
-			$(__docker_to_extglob "$global_options_with_args") )
-				(( counter++ ))
-				;;
-			-*)
-				;;
-			=)
-				(( counter++ ))
-				;;
-			*)
-				command="${words[$counter]}"
-				command_pos=$counter
-				break
-				;;
-		esac
-		(( counter++ ))
-	done
-
-	local binary="${words[0]}"
-	if [[ $binary == ?(*/)dockerd ]] ; then
-		# for the dockerd binary, we reuse completion of `docker daemon`.
-		# dockerd does not have subcommands and global options.
-		command=daemon
-		command_pos=0
-	fi
-
-	local completions_func=_docker_${command//-/_}
-	declare -F $completions_func >/dev/null && $completions_func
-
-	eval "$previous_extglob_setting"
-	return 0
-}
-
-eval "$__docker_previous_extglob_setting"
-unset __docker_previous_extglob_setting
-
-complete -F _docker docker docker.exe dockerd dockerd.exe
\ No newline at end of file
+# Make sure docker is installed
+_command_exists docker || return
+
+# Don't handle completion if it's already managed
+complete -p docker &>/dev/null && return
+
+_docker_bash_completion_paths=(
+  # MacOS
+  '/Applications/Docker.app/Contents/Resources/etc/docker.bash-completion'
+  # Linux
+  '/usr/share/bash-completion/completions/docker'
+)
+
+for fn in "${_docker_bash_completion_paths[@]}" ; do
+  if [ -r "$fn" ] ; then
+    source "$fn"
+    break
+  fi
+done

From e7e9d046282eea2f9113bf1ed1a57f96b858dfd1 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Tue, 19 May 2020 16:59:47 -0500
Subject: [PATCH 223/388] use || to silence exit 1 properly and quit fasd init

---
 plugins/available/fasd.plugin.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/available/fasd.plugin.bash b/plugins/available/fasd.plugin.bash
index 0a1ae918..d507f518 100644
--- a/plugins/available/fasd.plugin.bash
+++ b/plugins/available/fasd.plugin.bash
@@ -1,4 +1,6 @@
 cite about-plugin
 about-plugin 'load fasd, if you are using it'
 
-_command_exists fasd && eval $(fasd --init auto)
+_command_exists fasd || return
+
+eval "$(fasd --init auto)"

From 2a05292cda8b0476b9159a3e114ab5001f100c57 Mon Sep 17 00:00:00 2001
From: patricknraanes <patrick.n.raanes@gmail.com>
Date: Fri, 22 May 2020 13:10:17 +0200
Subject: [PATCH 224/388] Fix

---
 plugins/available/xterm.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/xterm.plugin.bash b/plugins/available/xterm.plugin.bash
index db8594a1..c55dccd4 100644
--- a/plugins/available/xterm.plugin.bash
+++ b/plugins/available/xterm.plugin.bash
@@ -3,7 +3,7 @@ about-plugin 'automatically set your xterm title with host and location info'
 
 
 _short-dirname () {
-  local dir_name=`dirs -0`
+  local dir_name=`dirs +0`
   [ "$SHORT_TERM_LINE" = true ] && [ ${#dir_name} -gt 8 ] && echo ${dir_name##*/} || echo $dir_name
 }
 

From 4faba37fa16ffabb290afa9251e0b8259d1f7496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Eduardo=20Montenegro=20Cavalcanti=20de=20Olive?=
 =?UTF-8?q?ira?= <jose.eduardo.mco@gmail.com>
Date: Mon, 1 Jun 2020 14:26:31 -0300
Subject: [PATCH 225/388] Adds explicit version declarations

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6fde9c4a..c89e6b05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,13 @@ _native_job: &native_job
 
 language: shell
 
+os: linux
+
+dist: xenial
+
+# This is the default xcode version. The Xcode version defines what
+osx_image: xcode9.4
+
 jobs:
   - <<: *native_job
     name: default Ubuntu
@@ -15,3 +22,4 @@ jobs:
   - <<: *native_job
     name: MacOS
     os: osx
+ 

From 9e41386a04eb983d6a2e1b18d6637fc416765812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Eduardo=20Montenegro=20Cavalcanti=20de=20Olive?=
 =?UTF-8?q?ira?= <jose.eduardo.mco@gmail.com>
Date: Mon, 1 Jun 2020 14:40:42 -0300
Subject: [PATCH 226/388] Update .travis.yml

---
 .travis.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c89e6b05..12d5e15e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,20 @@ os: linux
 
 dist: xenial
 
-# This is the default xcode version. The Xcode version defines what
-osx_image: xcode9.4
-
 jobs:
   - <<: *native_job
-    name: default Ubuntu
-    os: linux
+    name: Ubuntu 16.04
+  
   - <<: *native_job
-    name: MacOS
+    name: Ubuntu 18.04
+    dist: bionic
+    
+  - <<: *native_job
+    name: MacOS xcode9.4
     os: osx
- 
+    osx_image: xcode9.4 # Default xcode on Travis.
+    
+  - <<: *native_job
+    name: MacOS xcode11.5
+    os: osx
+    osx_image: xcode11.5 # Latest xcode on Travis.

From caced3b65f95febfeac0683c5b5eb7bec577da78 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 9 Jun 2020 12:36:06 +0200
Subject: [PATCH 227/388] Using $() instead of backticks to make shellcheck
 happy

---
 themes/base.theme.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 44ccb402..86024beb 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -83,10 +83,10 @@ RBENV_THEME_PROMPT_SUFFIX='|'
 RBFU_THEME_PROMPT_PREFIX=' |'
 RBFU_THEME_PROMPT_SUFFIX='|'
 
-GIT_EXE=`which git 2> /dev/null || true`
-P4_EXE=`which p4 2> /dev/null || true`
-HG_EXE=`which hg  2> /dev/null || true`
-SVN_EXE=`which svn  2> /dev/null || true`
+GIT_EXE=$(which git 2> /dev/null || true)
+P4_EXE=$(which p4 2> /dev/null || true)
+HG_EXE=$(which hg  2> /dev/null || true)
+SVN_EXE=$(which svn  2> /dev/null || true)
 
 function scm {
   if [[ "$SCM_CHECK" = false ]]; then SCM=$SCM_NONE

From 2ba3797da6d59529c7a12cdf5199c560b3ed69ee Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 9 Jun 2020 14:05:48 +0200
Subject: [PATCH 228/388] Added check for SVN not available

---
 themes/base.theme.bash | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 86024beb..4418d881 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -88,6 +88,15 @@ P4_EXE=$(which p4 2> /dev/null || true)
 HG_EXE=$(which hg  2> /dev/null || true)
 SVN_EXE=$(which svn  2> /dev/null || true)
 
+# Check for broken SVN exe that is caused by some versions of Xcode.
+# See https://github.com/Bash-it/bash-it/issues/1612 for more details.
+if [[ -x "$SVN_EXE" ]] ; then
+  if "$SVN_EXE" 2>&1 | grep -q "subversion command line tools are no longer provided" ; then
+    # Unset the SVN exe variable so that SVN commands are avoided.
+    SVN_EXE=""
+  fi
+fi
+
 function scm {
   if [[ "$SCM_CHECK" = false ]]; then SCM=$SCM_NONE
   elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then SCM=$SCM_GIT

From 47512a1624c5d968ce4b990223cc933a2b663961 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Sun, 14 Jun 2020 19:31:25 +0200
Subject: [PATCH 229/388] Checking for SVN return code

---
 themes/base.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 4418d881..97bbee45 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -91,7 +91,7 @@ SVN_EXE=$(which svn  2> /dev/null || true)
 # Check for broken SVN exe that is caused by some versions of Xcode.
 # See https://github.com/Bash-it/bash-it/issues/1612 for more details.
 if [[ -x "$SVN_EXE" ]] ; then
-  if "$SVN_EXE" 2>&1 | grep -q "subversion command line tools are no longer provided" ; then
+  if ! "$SVN_EXE" --version > /dev/null 2>&1 ; then
     # Unset the SVN exe variable so that SVN commands are avoided.
     SVN_EXE=""
   fi

From 47f668229232ce132e64aa2beec7fa1ca8a63803 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 15 Jun 2020 17:04:05 +0200
Subject: [PATCH 230/388] Added test case for base theme SVN functionality

Unit tests for #1612, #1613.
---
 test/fixtures/svn/broken/svn    |  3 ++
 test/fixtures/svn/working/svn   |  3 ++
 test/themes/base.theme.svn.bats | 81 +++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100755 test/fixtures/svn/broken/svn
 create mode 100755 test/fixtures/svn/working/svn
 create mode 100644 test/themes/base.theme.svn.bats

diff --git a/test/fixtures/svn/broken/svn b/test/fixtures/svn/broken/svn
new file mode 100755
index 00000000..3c310539
--- /dev/null
+++ b/test/fixtures/svn/broken/svn
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exit 72
diff --git a/test/fixtures/svn/working/svn b/test/fixtures/svn/working/svn
new file mode 100755
index 00000000..0fdcf091
--- /dev/null
+++ b/test/fixtures/svn/working/svn
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exit 0
diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
new file mode 100644
index 00000000..ce199ac1
--- /dev/null
+++ b/test/themes/base.theme.svn.bats
@@ -0,0 +1,81 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+load ../../lib/composure
+
+cite _about _param _example _group _author _version
+
+load ../../lib/helpers
+load ../../themes/base.theme
+
+function local_setup {
+  setup_test_fixture
+
+  # Copy the test fixture to the Bash-it folder
+  if command -v rsync &> /dev/null
+  then
+    rsync -a "$BASH_IT/test/fixtures/bash_it/" "$BASH_IT/"
+  else
+    find "$BASH_IT/test/fixtures/bash_it" \
+      -mindepth 1 -maxdepth 1 \
+      -exec cp -r {} "$BASH_IT/" \;
+  fi
+}
+
+setup_repo() {
+  upstream="$(mktemp -d)"
+  pushd "$upstream" > /dev/null
+  # Create a dummy SVN folder - this will not work with an actual `svn` command,
+  # but will be enough to trigger the SVN check in the base theme.
+  mkdir .svn
+
+  echo "$upstream"
+}
+
+setup_svn_path() {
+  local svn_path="$1"
+
+  # Make sure that the requested SVN script is available
+  assert_file_exist "$svn_path/svn"
+
+  export OLD_PATH="$PATH"
+  # Make sure that the requested SVN script is on the path
+  export PATH="$svn_path:/usr/bin:/bin:/usr/sbin"
+}
+
+reset_svn_path() {
+  export PATH="$OLD_PATH"
+  unset OLD_PATH
+}
+
+@test 'themes base: SVN: detect SVN repo' {
+  repo="$(setup_repo)"
+  pushd "$repo"
+
+  setup_svn_path "$BASH_IT/test/fixtures/svn/working"
+
+  # Load the base theme again so that the working SVN script is detected
+  load ../../themes/base.theme
+
+  scm
+  # Make sure that the SVN command is used
+  assert_equal "$SCM" "$SCM_SVN"
+
+  reset_svn_path
+}
+
+@test 'themes base: SVN: ignore SVN repo when using broken SVN command' {
+  repo="$(setup_repo)"
+  pushd "$repo"
+
+  setup_svn_path "$BASH_IT/test/fixtures/svn/broken"
+
+  # Load the base theme again so that the broken SVN script is detected
+  load ../../themes/base.theme
+
+  scm
+  # Make sure that the SVN command is not used
+  assert_equal "$SCM" "$SCM_NONE"
+
+  reset_svn_path
+}

From f933a86ff0bf4893b63ac6c5d6cb1b45aa8dbb0c Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 16 Jun 2020 09:24:24 +0200
Subject: [PATCH 231/388] Added tests for additional SVN scenarios

---
 test/fixtures/svn/working/svn   |  7 +++++
 test/themes/base.theme.svn.bats | 56 +++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/test/fixtures/svn/working/svn b/test/fixtures/svn/working/svn
index 0fdcf091..5d72d7cd 100755
--- a/test/fixtures/svn/working/svn
+++ b/test/fixtures/svn/working/svn
@@ -1,3 +1,10 @@
 #!/usr/bin/env bash
 
+# If the info command is called
+# AND the parent folder contains the .svn folder
+# THEN return the current path, similar to what `svn info` does
+if [[ "$1" = "info" ]] && [[ -d "../.svn" ]]; then
+  echo "$PWD"
+fi
+
 exit 0
diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
index ce199ac1..c358e404 100644
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -64,6 +64,43 @@ reset_svn_path() {
   reset_svn_path
 }
 
+@test 'themes base: SVN: detect SVN repo even from a subfolder' {
+  repo="$(setup_repo)"
+  pushd "$repo"
+
+  mkdir foo
+  pushd foo
+
+  setup_svn_path "$BASH_IT/test/fixtures/svn/working"
+
+  # Load the base theme again so that the working SVN script is detected
+  load ../../themes/base.theme
+
+  scm
+  # Make sure that the SVN command is used
+  assert_equal "$SCM" "$SCM_SVN"
+
+  reset_svn_path
+}
+
+@test 'themes base: SVN: no SCM if no .svn folder can be found' {
+  repo="$(setup_repo)"
+  pushd "$repo"
+
+  rm -rf .svn
+
+  setup_svn_path "$BASH_IT/test/fixtures/svn/working"
+
+  # Load the base theme again so that the working SVN script is detected
+  load ../../themes/base.theme
+
+  scm
+  # Make sure that the SVN command is used
+  assert_equal "$SCM" "$SCM_NONE"
+
+  reset_svn_path
+}
+
 @test 'themes base: SVN: ignore SVN repo when using broken SVN command' {
   repo="$(setup_repo)"
   pushd "$repo"
@@ -79,3 +116,22 @@ reset_svn_path() {
 
   reset_svn_path
 }
+
+@test 'themes base: SVN: ignore SVN repo even from a subfolder when using a broken SVN' {
+  repo="$(setup_repo)"
+  pushd "$repo"
+
+  mkdir foo
+  pushd foo
+
+  setup_svn_path "$BASH_IT/test/fixtures/svn/broken"
+
+  # Load the base theme again so that the working SVN script is detected
+  load ../../themes/base.theme
+
+  scm
+  # Make sure that the SVN command is used
+  assert_equal "$SCM" "$SCM_NONE"
+
+  reset_svn_path
+}

From 5aa525caae7610721b5da7daadf633e0df1bec5b Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 16 Jun 2020 09:25:07 +0200
Subject: [PATCH 232/388] Refactored setup/teardown

---
 test/themes/base.theme.svn.bats | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
index c358e404..0a525c4a 100644
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -20,9 +20,16 @@ function local_setup {
       -mindepth 1 -maxdepth 1 \
       -exec cp -r {} "$BASH_IT/" \;
   fi
+
+  export OLD_PATH="$PATH"
 }
 
-setup_repo() {
+function local_teardown {
+  export PATH="$OLD_PATH"
+  unset OLD_PATH
+}
+
+function setup_repo {
   upstream="$(mktemp -d)"
   pushd "$upstream" > /dev/null
   # Create a dummy SVN folder - this will not work with an actual `svn` command,
@@ -32,22 +39,16 @@ setup_repo() {
   echo "$upstream"
 }
 
-setup_svn_path() {
+function setup_svn_path {
   local svn_path="$1"
 
   # Make sure that the requested SVN script is available
   assert_file_exist "$svn_path/svn"
 
-  export OLD_PATH="$PATH"
   # Make sure that the requested SVN script is on the path
   export PATH="$svn_path:/usr/bin:/bin:/usr/sbin"
 }
 
-reset_svn_path() {
-  export PATH="$OLD_PATH"
-  unset OLD_PATH
-}
-
 @test 'themes base: SVN: detect SVN repo' {
   repo="$(setup_repo)"
   pushd "$repo"
@@ -60,8 +61,6 @@ reset_svn_path() {
   scm
   # Make sure that the SVN command is used
   assert_equal "$SCM" "$SCM_SVN"
-
-  reset_svn_path
 }
 
 @test 'themes base: SVN: detect SVN repo even from a subfolder' {
@@ -79,8 +78,6 @@ reset_svn_path() {
   scm
   # Make sure that the SVN command is used
   assert_equal "$SCM" "$SCM_SVN"
-
-  reset_svn_path
 }
 
 @test 'themes base: SVN: no SCM if no .svn folder can be found' {
@@ -97,8 +94,6 @@ reset_svn_path() {
   scm
   # Make sure that the SVN command is used
   assert_equal "$SCM" "$SCM_NONE"
-
-  reset_svn_path
 }
 
 @test 'themes base: SVN: ignore SVN repo when using broken SVN command' {
@@ -113,8 +108,6 @@ reset_svn_path() {
   scm
   # Make sure that the SVN command is not used
   assert_equal "$SCM" "$SCM_NONE"
-
-  reset_svn_path
 }
 
 @test 'themes base: SVN: ignore SVN repo even from a subfolder when using a broken SVN' {
@@ -132,6 +125,4 @@ reset_svn_path() {
   scm
   # Make sure that the SVN command is used
   assert_equal "$SCM" "$SCM_NONE"
-
-  reset_svn_path
 }

From c02638e94653d4ba7b1b3020d18b5730f2a4f382 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 16 Jun 2020 16:57:37 +0200
Subject: [PATCH 233/388] Fixed comment

---
 test/fixtures/svn/broken/svn    | 1 +
 test/themes/base.theme.svn.bats | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/svn/broken/svn b/test/fixtures/svn/broken/svn
index 3c310539..c9f5235b 100755
--- a/test/fixtures/svn/broken/svn
+++ b/test/fixtures/svn/broken/svn
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
+# Simply return an error code to simulate a broken SVN installation
 exit 72
diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
index 0a525c4a..0b578071 100644
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -119,7 +119,7 @@ function setup_svn_path {
 
   setup_svn_path "$BASH_IT/test/fixtures/svn/broken"
 
-  # Load the base theme again so that the working SVN script is detected
+  # Load the base theme again so that the broken SVN script is detected
   load ../../themes/base.theme
 
   scm

From 3cffa3509252ae8bd7bc074b58cb9d3f732fec41 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 16 Jun 2020 16:59:29 +0200
Subject: [PATCH 234/388] Fixed some more comments

---
 test/themes/base.theme.svn.bats | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
index 0b578071..89279d1b 100644
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -92,7 +92,7 @@ function setup_svn_path {
   load ../../themes/base.theme
 
   scm
-  # Make sure that the SVN command is used
+  # Make sure that no SVN command is used
   assert_equal "$SCM" "$SCM_NONE"
 }
 
@@ -106,7 +106,7 @@ function setup_svn_path {
   load ../../themes/base.theme
 
   scm
-  # Make sure that the SVN command is not used
+  # Make sure that no SVN command is not used
   assert_equal "$SCM" "$SCM_NONE"
 }
 
@@ -123,6 +123,6 @@ function setup_svn_path {
   load ../../themes/base.theme
 
   scm
-  # Make sure that the SVN command is used
+  # Make sure that no SVN command is used
   assert_equal "$SCM" "$SCM_NONE"
 }

From a204f85f4168932c76fd9748e6a6c41a61a64741 Mon Sep 17 00:00:00 2001
From: finn-matti <56148301+finn-matti@users.noreply.github.com>
Date: Wed, 17 Jun 2020 11:11:52 +0300
Subject: [PATCH 235/388] Add git difftool alias

See #1617
---
 aliases/available/git.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 913e8435..ecc9dfd7 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -37,6 +37,7 @@ alias grv='git remote -v'
 alias gra='git remote add'
 alias gd='git diff'
 alias gds='git diff --staged'
+alias gdt='git difftool'
 alias gdv='git diff -w "$@" | vim -R -'
 alias gc='git commit -v'
 alias gca='git commit -v -a'

From 107cfe5dafbaf4320471e5cb45207cc70e4db2b4 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Wed, 17 Jun 2020 10:26:47 +0200
Subject: [PATCH 236/388] Fixed comparison for SVN info parameter

Based on @arturmartins comment in #1615 - thanks!
---
 test/fixtures/svn/working/svn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/svn/working/svn b/test/fixtures/svn/working/svn
index 5d72d7cd..910d01e7 100755
--- a/test/fixtures/svn/working/svn
+++ b/test/fixtures/svn/working/svn
@@ -3,7 +3,7 @@
 # If the info command is called
 # AND the parent folder contains the .svn folder
 # THEN return the current path, similar to what `svn info` does
-if [[ "$1" = "info" ]] && [[ -d "../.svn" ]]; then
+if [[ "$1" == "info" ]] && [[ -d "../.svn" ]]; then
   echo "$PWD"
 fi
 

From 937094f277c864625c6ad2a1f5a768c4f2e80abd Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 19 Jun 2020 01:45:59 +0300
Subject: [PATCH 237/388] aliases/git: Add git rebase aliases

---
 aliases/available/git.aliases.bash | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 913e8435..566bfb11 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -35,6 +35,9 @@ alias gpom='git push origin master'
 alias gr='git remote'
 alias grv='git remote -v'
 alias gra='git remote add'
+alias grb='git rebase'
+alias grm='git rebase master'
+alias grmi='git rebase master -i'
 alias gd='git diff'
 alias gds='git diff --staged'
 alias gdv='git diff -w "$@" | vim -R -'

From 7232506dabce465fc8deb60ba110209b370111e5 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 19 Jun 2020 01:48:11 +0300
Subject: [PATCH 238/388] aliases/git: Add git show alias

---
 aliases/available/git.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 566bfb11..f3c5121e 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -68,6 +68,7 @@ alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master
 alias gll='git log --graph --pretty=oneline --abbrev-commit'
 alias gg="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
 alias ggs="gg --stat"
+alias gsh="git show"
 alias gsl="git shortlog -sn"
 alias gwc="git whatchanged"
 alias gt="git tag"

From 83fdc89ec194960a0ce72b2f4080614fcfe1a31a Mon Sep 17 00:00:00 2001
From: Markus Krause <mkrause@centos8.casaph.lan>
Date: Sun, 6 Oct 2019 12:33:12 +0200
Subject: [PATCH 239/388] implement gitstatusd support

---
 bash_it.sh                          |  7 +++
 template/bash_profile.template.bash |  6 +++
 themes/base.theme.bash              | 35 ++++++++++--
 themes/githelpers.theme.bash        | 84 +++++++++++++++++++++--------
 4 files changed, 105 insertions(+), 27 deletions(-)

diff --git a/bash_it.sh b/bash_it.sh
index ab911019..e09c3ba7 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -121,5 +121,12 @@ if ! command -v reload &>/dev/null && [ -n "$BASH_IT_RELOAD_LEGACY" ]; then
   esac
 fi
 
+# If gitstatusd is requested for the current shell, launch it if the shell is interactive
+if [[ "${SCM_GIT_USE_GITSTATUSD}" == "true" ]] && [[ "$SCM_CHECK" == "true" ]] && [[ $- == *i* ]]; then
+  test -z "${SCM_GIT_GITSTATUSD_LOC}" || SCM_GIT_GITSTATUSD_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
+  source "${SCM_GIT_GITSTATUSD_LOC}"
+  gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
+fi
+
 # Disable trap DEBUG on subshells - https://github.com/Bash-it/bash-it/pull/1040
 set +T
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index e7f92dd3..9e9e6b9d 100755
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -32,6 +32,12 @@ export TODO="t"
 
 # Set this to false to turn off version control status checking within the prompt for all themes
 export SCM_CHECK=true
+# when using Git, consider installing https://github.com/romkatv/gitstatus for faster status prompt
+# enable it here if you wish, change the LOC variable if you did not choose the standard location in your home
+#export SCM_GIT_USE_GITSTATUSD=true
+#export SCM_GIT_GITSTATUSD_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
+# per default gitstatusd uses 2 times as many threads as CPU cores, you can change this here if you must
+#export GITSTATUS_NUM_THREADS=8
 
 # Set Xterm/screen/Tmux title with only a short hostname.
 # Uncomment this (or set SHORT_HOSTNAME to something else),
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 97bbee45..f92bd268 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -34,6 +34,8 @@ SCM_GIT_SHOW_CURRENT_USER=${SCM_GIT_SHOW_CURRENT_USER:=false}
 SCM_GIT_SHOW_MINIMAL_INFO=${SCM_GIT_SHOW_MINIMAL_INFO:=false}
 SCM_GIT_SHOW_STASH_INFO=${SCM_GIT_SHOW_STASH_INFO:=true}
 SCM_GIT_SHOW_COMMIT_COUNT=${SCM_GIT_SHOW_COMMIT_COUNT:=true}
+SCM_GIT_USE_GITSTATUSD=${SCM_GIT_USE_GITSTATUSD:=false}
+SCM_GIT_GITSTATUSD_LOC=${SCM_GIT_GITSTATUSD_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
 
 SCM_GIT='git'
 SCM_GIT_CHAR='±'
@@ -191,6 +193,15 @@ function git_prompt_minimal_info {
 }
 
 function git_prompt_vars {
+  if ${SCM_GIT_USE_GITSTATUSD}; then # use faster gitstatusd
+    gitstatus_query # call gitstatusd
+    if [[ -z ${VCS_STATUS_WORKDIR} ]] ; then # this var is guaranteed to exist if query was successful
+      SCM_GIT_GITSTATUSD_RAN=false
+    else
+      SCM_GIT_GITSTATUSD_RAN=true # use this in githelpers and below to choose gitstatusd output
+    fi
+  fi
+
   if _git-branch &> /dev/null; then
     SCM_GIT_DETACHED="false"
     SCM_BRANCH="${SCM_THEME_BRANCH_PREFIX}\$(_git-friendly-ref)$(_git-remote-info)"
@@ -206,7 +217,12 @@ function git_prompt_vars {
     SCM_BRANCH="${detached_prefix}\$(_git-friendly-ref)"
   fi
 
-  IFS=$'\t' read -r commits_behind commits_ahead <<< "$(_git-upstream-behind-ahead)"
+  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    commits_behind=${VCS_STATUS_COMMITS_BEHIND}
+    commits_ahead=${VCS_STATUS_COMMITS_AHEAD}
+  else
+    IFS=$'\t' read -r commits_behind commits_ahead <<< "$(_git-upstream-behind-ahead)"
+  fi
   if [[ "${commits_ahead}" -gt 0 ]]; then
     SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_AHEAD_CHAR}"
     [[ "${SCM_GIT_SHOW_COMMIT_COUNT}" = "true" ]] && SCM_BRANCH+="${commits_ahead}"
@@ -218,13 +234,23 @@ function git_prompt_vars {
 
   if [[ "${SCM_GIT_SHOW_STASH_INFO}" = "true" ]]; then
     local stash_count
-    stash_count="$(git stash list 2> /dev/null | wc -l | tr -d ' ')"
+    if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+      stash_count=${VCS_STATUS_STASHES}
+    else
+      stash_count="$(git stash list 2> /dev/null | wc -l | tr -d ' ')"
+    fi
     [[ "${stash_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_STASH_CHAR_PREFIX}${stash_count}${SCM_GIT_STASH_CHAR_SUFFIX}"
   fi
 
   SCM_STATE=${GIT_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
   if ! _git-hide-status; then
-    IFS=$'\t' read -r untracked_count unstaged_count staged_count <<< "$(_git-status-counts)"
+    if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+      untracked_count=${VCS_STATUS_NUM_UNTRACKED}
+      unstaged_count=${VCS_STATUS_NUM_UNSTAGED}
+      staged_count=${VCS_STATUS_NUM_STAGED}
+    else
+      IFS=$'\t' read -r untracked_count unstaged_count staged_count <<< "$(_git-status-counts)"
+    fi
     if [[ "${untracked_count}" -gt 0 || "${unstaged_count}" -gt 0 || "${staged_count}" -gt 0 ]]; then
       SCM_DIRTY=1
       if [[ "${SCM_GIT_SHOW_DETAILS}" = "true" ]]; then
@@ -236,12 +262,13 @@ function git_prompt_vars {
     fi
   fi
 
+  # no if for gitstatusd here, user extraction is not supported by it
   [[ "${SCM_GIT_SHOW_CURRENT_USER}" == "true" ]] && SCM_BRANCH+="$(git_user_info)"
 
   SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
   SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
-
   SCM_CHANGE=$(_git-short-sha 2>/dev/null || echo "")
+
 }
 
 function p4_prompt_vars {
diff --git a/themes/githelpers.theme.bash b/themes/githelpers.theme.bash
index 24c4b1f4..c31e1ff5 100644
--- a/themes/githelpers.theme.bash
+++ b/themes/githelpers.theme.bash
@@ -9,11 +9,19 @@ function _git-symbolic-ref {
 # same commit. _git-branch is used to explicitly choose the checked-out
 # branch.
 function _git-branch {
- git symbolic-ref -q --short HEAD 2> /dev/null || return 1
+  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    test -n "${VCS_STATUS_LOCAL_BRANCH}" && echo "${VCS_STATUS_LOCAL_BRANCH}" || return 1
+  else 
+    git symbolic-ref -q --short HEAD 2> /dev/null || return 1
+  fi
 }
 
 function _git-tag {
-  git describe --tags --exact-match 2> /dev/null
+  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    test -n "${VCS_STATUS_TAG}" && echo "${VCS_STATUS_TAG}"
+  else 
+    git describe --tags --exact-match 2> /dev/null
+  fi
 }
 
 function _git-commit-description {
@@ -21,12 +29,20 @@ function _git-commit-description {
 }
 
 function _git-short-sha {
-  git rev-parse --short HEAD
+  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    echo ${VCS_STATUS_COMMIT:0:7}
+  else
+    git rev-parse --short HEAD
+  fi
 }
 
 # Try the checked-out branch first to avoid collision with branches pointing to the same ref.
 function _git-friendly-ref {
+  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    _git-branch || _git-tag || _git-short-sha # there is no tag based describe output in gitstatusd
+  else 
     _git-branch || _git-tag || _git-commit-description || _git-short-sha
+  fi
 }
 
 function _git-num-remotes {
@@ -101,29 +117,51 @@ function _git-status-counts {
 }
 
 function _git-remote-info {
-  [[ "$(_git-upstream)" == "" ]] && return || true
 
-  [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && local same_branch_name=true || true
-  local same_branch_name=
-  [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && same_branch_name=true
-  if ([[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]] && [[ "$(_git-num-remotes)" -ge 2 ]]) ||
-      [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]]; then
-    if [[ "${same_branch_name}" != "true" ]]; then
-      remote_info="\$(_git-upstream)"
-    else
-      remote_info="$(_git-upstream-remote)"
+  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then # prompt handling only, reimplement because patching the routine below gets ugly
+    [[ "${VCS_STATUS_REMOTE_NAME}" == "" ]] && return || true
+    [[ "${VCS_STATUS_LOCAL_BRANCH}" == "${VCS_STATUS_REMOTE_BRANCH}" ]] && local same_branch_name=true || true
+    local same_branch_name=
+    [[ "${VCS_STATUS_LOCAL_BRANCH}" == "${VCS_STATUS_REMOTE_BRANCH}" ]] && same_branch_name=true
+    if [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]] || [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]]; then # no multiple remote support in gitstatusd
+      if [[ "${same_branch_name}" != "true" ]]; then
+        remote_info="\${VCS_STATUS_REMOTE_NAME}"
+      else
+        remote_info="${VCS_STATUS_REMOTE_NAME}/${VCS_STATUS_REMOTE_BRANCH}"
+      fi
+    elif [[ ${same_branch_name} != "true" ]]; then
+      remote_info="\${VCS_STATUS_REMOTE_BRANCH}"
     fi
-  elif [[ ${same_branch_name} != "true" ]]; then
-    remote_info="\$(_git-upstream-branch)"
-  fi
-  if [[ -n "${remote_info}" ]];then
-    local branch_prefix
-    if _git-upstream-branch-gone; then
-      branch_prefix="${SCM_THEME_BRANCH_GONE_PREFIX}"
-    else
-      branch_prefix="${SCM_THEME_BRANCH_TRACK_PREFIX}"
+    if [[ -n "${remote_info}" ]];then
+      local branch_prefix 
+      branch_prefix="${SCM_THEME_BRANCH_TRACK_PREFIX}" # no support for gone remote branches in gitstatusd
+      echo "${branch_prefix}${remote_info}"
+    fi
+  else 
+    [[ "$(_git-upstream)" == "" ]] && return || true
+
+    [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && local same_branch_name=true || true
+    local same_branch_name=
+    [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && same_branch_name=true
+    if ([[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]] && [[ "$(_git-num-remotes)" -ge 2 ]]) ||
+        [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]]; then
+      if [[ "${same_branch_name}" != "true" ]]; then
+        remote_info="\$(_git-upstream)"
+      else
+        remote_info="$(_git-upstream-remote)"
+      fi
+    elif [[ ${same_branch_name} != "true" ]]; then
+      remote_info="\$(_git-upstream-branch)"
+    fi
+    if [[ -n "${remote_info}" ]];then
+      local branch_prefix
+      if _git-upstream-branch-gone; then
+        branch_prefix="${SCM_THEME_BRANCH_GONE_PREFIX}"
+      else
+        branch_prefix="${SCM_THEME_BRANCH_TRACK_PREFIX}"
+      fi
+      echo "${branch_prefix}${remote_info}"
     fi
-    echo "${branch_prefix}${remote_info}"
   fi
 }
 

From feae99431a5b38095e3175f9e769437fb187143c Mon Sep 17 00:00:00 2001
From: Markus Krause <mkrause@centos8.casaph.lan>
Date: Sun, 6 Oct 2019 14:10:49 +0200
Subject: [PATCH 240/388] implement feedback

---
 themes/base.theme.bash | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index f92bd268..92031860 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -36,6 +36,7 @@ SCM_GIT_SHOW_STASH_INFO=${SCM_GIT_SHOW_STASH_INFO:=true}
 SCM_GIT_SHOW_COMMIT_COUNT=${SCM_GIT_SHOW_COMMIT_COUNT:=true}
 SCM_GIT_USE_GITSTATUSD=${SCM_GIT_USE_GITSTATUSD:=false}
 SCM_GIT_GITSTATUSD_LOC=${SCM_GIT_GITSTATUSD_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
+SCM_GIT_GITSTATUSD_RAN=${SCM_GIT_GITSTATUSD_RAN:=false}
 
 SCM_GIT='git'
 SCM_GIT_CHAR='±'
@@ -193,13 +194,10 @@ function git_prompt_minimal_info {
 }
 
 function git_prompt_vars {
-  if ${SCM_GIT_USE_GITSTATUSD}; then # use faster gitstatusd
-    gitstatus_query # call gitstatusd
-    if [[ -z ${VCS_STATUS_WORKDIR} ]] ; then # this var is guaranteed to exist if query was successful
-      SCM_GIT_GITSTATUSD_RAN=false
-    else
-      SCM_GIT_GITSTATUSD_RAN=true # use this in githelpers and below to choose gitstatusd output
-    fi
+  if ${SCM_GIT_USE_GITSTATUSD} && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatusd
+    SCM_GIT_GITSTATUSD_RAN=true # use this in githelpers and below to choose gitstatusd output
+  else
+    SCM_GIT_GITSTATUSD_RAN=false
   fi
 
   if _git-branch &> /dev/null; then

From 3c0738ba4325997895a4fda2ed62916d8a9188d6 Mon Sep 17 00:00:00 2001
From: Markus Krause <mkrause@centos8.casaph.lan>
Date: Sun, 6 Oct 2019 17:23:18 +0200
Subject: [PATCH 241/388] fix expansion inconsistency

---
 themes/githelpers.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/githelpers.theme.bash b/themes/githelpers.theme.bash
index c31e1ff5..2ee242df 100644
--- a/themes/githelpers.theme.bash
+++ b/themes/githelpers.theme.bash
@@ -127,7 +127,7 @@ function _git-remote-info {
       if [[ "${same_branch_name}" != "true" ]]; then
         remote_info="\${VCS_STATUS_REMOTE_NAME}"
       else
-        remote_info="${VCS_STATUS_REMOTE_NAME}/${VCS_STATUS_REMOTE_BRANCH}"
+        remote_info="\${VCS_STATUS_REMOTE_NAME}/\${VCS_STATUS_REMOTE_BRANCH}"
       fi
     elif [[ ${same_branch_name} != "true" ]]; then
       remote_info="\${VCS_STATUS_REMOTE_BRANCH}"

From fb2e8549ad805c735d642947e81a9d2f4522ac95 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 19 Jun 2020 19:44:21 +0300
Subject: [PATCH 242/388] themes: Tidy base.theme and remove uneeded changes

---
 themes/base.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 92031860..fb362d78 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -265,8 +265,8 @@ function git_prompt_vars {
 
   SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
   SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
-  SCM_CHANGE=$(_git-short-sha 2>/dev/null || echo "")
 
+  SCM_CHANGE=$(_git-short-sha 2>/dev/null || echo "")
 }
 
 function p4_prompt_vars {

From 5d1403059112c5c72d79ec345525380cd49e0226 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 19 Jun 2020 19:45:45 +0300
Subject: [PATCH 243/388] plugins: Add gitstatud plugin

---
 bash_it.sh                               |  7 ------
 plugins/available/gitstatusd.plugin.bash | 14 +++++++++++
 template/bash_profile.template.bash      |  4 +---
 themes/base.theme.bash                   |  3 +--
 themes/githelpers.theme.bash             | 30 +++++++++++++-----------
 5 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 plugins/available/gitstatusd.plugin.bash

diff --git a/bash_it.sh b/bash_it.sh
index e09c3ba7..ab911019 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -121,12 +121,5 @@ if ! command -v reload &>/dev/null && [ -n "$BASH_IT_RELOAD_LEGACY" ]; then
   esac
 fi
 
-# If gitstatusd is requested for the current shell, launch it if the shell is interactive
-if [[ "${SCM_GIT_USE_GITSTATUSD}" == "true" ]] && [[ "$SCM_CHECK" == "true" ]] && [[ $- == *i* ]]; then
-  test -z "${SCM_GIT_GITSTATUSD_LOC}" || SCM_GIT_GITSTATUSD_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
-  source "${SCM_GIT_GITSTATUSD_LOC}"
-  gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
-fi
-
 # Disable trap DEBUG on subshells - https://github.com/Bash-it/bash-it/pull/1040
 set +T
diff --git a/plugins/available/gitstatusd.plugin.bash b/plugins/available/gitstatusd.plugin.bash
new file mode 100644
index 00000000..02794394
--- /dev/null
+++ b/plugins/available/gitstatusd.plugin.bash
@@ -0,0 +1,14 @@
+cite about-plugin
+about-plugin 'speeds up your life by using gitstatusd for git status calculations. install from https://github.com/romkatv/gitstatus'
+
+[[ "$SCM_CHECK" == "true" ]] || return # No scm-check
+
+[[ $- == *i* ]] || return  # non-interactive shell
+
+SCM_GIT_GITSTATUSD_LOC=${SCM_GIT_GITSTATUSD_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
+if [[ -f "${SCM_GIT_GITSTATUSD_LOC}" ]]; then
+  source "${SCM_GIT_GITSTATUSD_LOC}"
+  # Start the actual gitstatusd binary
+  gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
+  export SCM_GIT_USE_GITSTATUSD=true
+fi
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index 9e9e6b9d..efafa8d9 100755
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -32,9 +32,7 @@ export TODO="t"
 
 # Set this to false to turn off version control status checking within the prompt for all themes
 export SCM_CHECK=true
-# when using Git, consider installing https://github.com/romkatv/gitstatus for faster status prompt
-# enable it here if you wish, change the LOC variable if you did not choose the standard location in your home
-#export SCM_GIT_USE_GITSTATUSD=true
+# Set to actual location of gitstatusd if installed
 #export SCM_GIT_GITSTATUSD_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
 # per default gitstatusd uses 2 times as many threads as CPU cores, you can change this here if you must
 #export GITSTATUS_NUM_THREADS=8
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index fb362d78..26527659 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -35,7 +35,6 @@ SCM_GIT_SHOW_MINIMAL_INFO=${SCM_GIT_SHOW_MINIMAL_INFO:=false}
 SCM_GIT_SHOW_STASH_INFO=${SCM_GIT_SHOW_STASH_INFO:=true}
 SCM_GIT_SHOW_COMMIT_COUNT=${SCM_GIT_SHOW_COMMIT_COUNT:=true}
 SCM_GIT_USE_GITSTATUSD=${SCM_GIT_USE_GITSTATUSD:=false}
-SCM_GIT_GITSTATUSD_LOC=${SCM_GIT_GITSTATUSD_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
 SCM_GIT_GITSTATUSD_RAN=${SCM_GIT_GITSTATUSD_RAN:=false}
 
 SCM_GIT='git'
@@ -194,7 +193,7 @@ function git_prompt_minimal_info {
 }
 
 function git_prompt_vars {
-  if ${SCM_GIT_USE_GITSTATUSD} && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatusd
+  if ${SCM_GIT_USE_GITSTATUSD} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatusd
     SCM_GIT_GITSTATUSD_RAN=true # use this in githelpers and below to choose gitstatusd output
   else
     SCM_GIT_GITSTATUSD_RAN=false
diff --git a/themes/githelpers.theme.bash b/themes/githelpers.theme.bash
index 2ee242df..fd5b3ce7 100644
--- a/themes/githelpers.theme.bash
+++ b/themes/githelpers.theme.bash
@@ -118,33 +118,35 @@ function _git-status-counts {
 
 function _git-remote-info {
 
-  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then # prompt handling only, reimplement because patching the routine below gets ugly
-    [[ "${VCS_STATUS_REMOTE_NAME}" == "" ]] && return || true
-    [[ "${VCS_STATUS_LOCAL_BRANCH}" == "${VCS_STATUS_REMOTE_BRANCH}" ]] && local same_branch_name=true || true
+  # prompt handling only, reimplement because patching the routine below gets ugly
+  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    [[ "${VCS_STATUS_REMOTE_NAME}" == "" ]] && return
+    [[ "${VCS_STATUS_LOCAL_BRANCH}" == "${VCS_STATUS_REMOTE_BRANCH}" ]] && local same_branch_name=true
     local same_branch_name=
     [[ "${VCS_STATUS_LOCAL_BRANCH}" == "${VCS_STATUS_REMOTE_BRANCH}" ]] && same_branch_name=true
-    if [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]] || [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]]; then # no multiple remote support in gitstatusd
+    # no multiple remote support in gitstatusd
+    if [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" || "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]]; then
       if [[ "${same_branch_name}" != "true" ]]; then
-        remote_info="\${VCS_STATUS_REMOTE_NAME}"
+        remote_info="${VCS_STATUS_REMOTE_NAME}/${VCS_STATUS_REMOTE_BRANCH}"
       else
-        remote_info="\${VCS_STATUS_REMOTE_NAME}/\${VCS_STATUS_REMOTE_BRANCH}"
+        remote_info="${VCS_STATUS_REMOTE_NAME}"
       fi
     elif [[ ${same_branch_name} != "true" ]]; then
-      remote_info="\${VCS_STATUS_REMOTE_BRANCH}"
+      remote_info="${VCS_STATUS_REMOTE_BRANCH}"
     fi
     if [[ -n "${remote_info}" ]];then
-      local branch_prefix 
-      branch_prefix="${SCM_THEME_BRANCH_TRACK_PREFIX}" # no support for gone remote branches in gitstatusd
+      # no support for gone remote branches in gitstatusd
+      local branch_prefix="${SCM_THEME_BRANCH_TRACK_PREFIX}"
       echo "${branch_prefix}${remote_info}"
     fi
-  else 
-    [[ "$(_git-upstream)" == "" ]] && return || true
+  else
+    [[ "$(_git-upstream)" == "" ]] && return
 
-    [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && local same_branch_name=true || true
+    [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && local same_branch_name=true
     local same_branch_name=
     [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && same_branch_name=true
-    if ([[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]] && [[ "$(_git-num-remotes)" -ge 2 ]]) ||
-        [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]]; then
+    if [[ ("${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" && "$(_git-num-remotes)" -ge 2) ||
+           "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]]; then
       if [[ "${same_branch_name}" != "true" ]]; then
         remote_info="\$(_git-upstream)"
       else

From b95062192a241e5261e2008e0fed023bcff76620 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 19 Jun 2020 21:58:45 +0300
Subject: [PATCH 244/388] Add docs about gitstatusd in README.md

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index adb783e6..314e77b8 100644
--- a/README.md
+++ b/README.md
@@ -395,6 +395,13 @@ $ git config --global --add bash-it.hide-status 1
 
 Setting this flag globally has the same effect as `SCM_CHECK=true`, but only for Git repos.
 
+### Speed up git status calculations
+
+As an alternative to ignoring repo status entirely, you can try out the `gitstatusd` plugin.
+This plugin speeds up all `git status` calculations by up to 10x times!
+
+**NOTE**: You will need to clone `gitstatus` repo from [here](https://github.com/romkatv/gitstatus).
+
 ### Pass function renamed to passgen
 
 The Bash-it `pass` function has been renamed to `passgen` in order to avoid a naming conflict with the [pass password manager](https://www.passwordstore.org/).

From 4f4bae95e42b1c7caab949aa44be711194679698 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 14:11:00 +0300
Subject: [PATCH 245/388] tests: Fix search git test

---
 test/lib/search.bats | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/lib/search.bats b/test/lib/search.bats
index a7c1a23f..60c06be2 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -39,7 +39,12 @@ function local_teardown {
 @test "search: git" {
   run _bash-it-search 'git' --no-color
   assert_line -n 0 '      aliases:  git   gitsvn  '
-  assert_line -n 1 '      plugins:  autojump   git   git-subrepo   jgitflow   jump  '
+  assert_line -n 1 -p '      plugins:'
+  for plugin in "autojump" "git" "gitstatusd" "git-subrepo" "jgitflow" "jump"
+  do
+    echo $plugin
+    assert_line -n 1 -p $plugin
+  done
   assert_line -n 2 '  completions:  git   git_flow   git_flow_avh  '
 }
 

From bda85c36794dafbe0a6c063bfde29565dee30b09 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 14:37:21 +0300
Subject: [PATCH 246/388] lib: Add on-disable-callback for plugins to use

---
 DEVELOPMENT.md   |  5 +++++
 lib/helpers.bash | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index ba9efe60..33276b71 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -43,3 +43,8 @@ For `aliases`, `plugins` and `completions`, the following rules are applied that
 Having the order based on a numeric priority in a common directory allows for more flexibility. While in general, aliases are loaded first (since their default priority is 150), it's possible to load some aliases after the plugins, or some plugins after completions by setting the items' load priority. This is more flexible than a fixed type-based order or a strict alphabetical order based on name.
 
 These items are subject to change. When making changes to the internal functionality, this page needs to be updated as well.
+
+## Plugin Disable Callbacks
+
+Plugins can define a function that will be called when the plugin is being disabled.
+The callback name should be `{PLUGIN_NAME}_on_disable`, you can see `gitstatus` for usage example.
diff --git a/lib/helpers.bash b/lib/helpers.bash
index e7ef15ba..9c4b3c43 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -318,6 +318,17 @@ _bash-it-describe ()
     printf '%s\n' "$ bash-it disable $file_type <$file_type name> [$file_type name]... -or- $ bash-it disable $file_type all"
 }
 
+_on-disable-callback()
+{
+    _about 'Calls the disabled plugin destructor, if present'
+    _param '1: plugin name'
+    _example '$ _on-disable-callback gitstatusd'
+    _group 'lib'
+
+    callback=$1_on_disable
+    _command_exists $callback && $callback
+}
+
 _disable-plugin ()
 {
     _about 'disables bash_it plugin'
@@ -326,6 +337,7 @@ _disable-plugin ()
     _group 'lib'
 
     _disable-thing "plugins" "plugin" $1
+    _on-disable-callback $1
 }
 
 _disable-alias ()

From 1143bb8ddf0c35e3e6f565dd4a5e0add803742ea Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 14:37:39 +0300
Subject: [PATCH 247/388] plugins: Add disable callback for gitstatusd

---
 plugins/available/gitstatusd.plugin.bash | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/available/gitstatusd.plugin.bash b/plugins/available/gitstatusd.plugin.bash
index 02794394..0658fb1a 100644
--- a/plugins/available/gitstatusd.plugin.bash
+++ b/plugins/available/gitstatusd.plugin.bash
@@ -1,6 +1,15 @@
 cite about-plugin
 about-plugin 'speeds up your life by using gitstatusd for git status calculations. install from https://github.com/romkatv/gitstatus'
 
+
+function gitstatusd_on_disable() {
+  about 'Destructor of gitstatusd plugin'
+  group 'gitstatusd'
+
+  unset SCM_GIT_USE_GITSTATUSD
+  gitstatus_stop
+}
+
 [[ "$SCM_CHECK" == "true" ]] || return # No scm-check
 
 [[ $- == *i* ]] || return  # non-interactive shell

From 6294797986d86393b0c80c7c6d246713a978b550 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 15:15:55 +0300
Subject: [PATCH 248/388] Rename SCM_GIT_GITSTATUSD_LOC to
 SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC

---
 plugins/available/gitstatusd.plugin.bash | 6 +++---
 template/bash_profile.template.bash      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/available/gitstatusd.plugin.bash b/plugins/available/gitstatusd.plugin.bash
index 0658fb1a..3551c6f9 100644
--- a/plugins/available/gitstatusd.plugin.bash
+++ b/plugins/available/gitstatusd.plugin.bash
@@ -14,9 +14,9 @@ function gitstatusd_on_disable() {
 
 [[ $- == *i* ]] || return  # non-interactive shell
 
-SCM_GIT_GITSTATUSD_LOC=${SCM_GIT_GITSTATUSD_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
-if [[ -f "${SCM_GIT_GITSTATUSD_LOC}" ]]; then
-  source "${SCM_GIT_GITSTATUSD_LOC}"
+SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC=${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
+if [[ -f "${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC}" ]]; then
+  source "${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC}"
   # Start the actual gitstatusd binary
   gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
   export SCM_GIT_USE_GITSTATUSD=true
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index efafa8d9..6fa8e516 100755
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -32,8 +32,8 @@ export TODO="t"
 
 # Set this to false to turn off version control status checking within the prompt for all themes
 export SCM_CHECK=true
-# Set to actual location of gitstatusd if installed
-#export SCM_GIT_GITSTATUSD_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
+# Set to actual location of gitstatusd.plugin.sh if installed
+#export SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
 # per default gitstatusd uses 2 times as many threads as CPU cores, you can change this here if you must
 #export GITSTATUS_NUM_THREADS=8
 

From 3eac73f613a81cf4b13882317c9106f81fec592f Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 21 Jun 2020 12:54:53 +0300
Subject: [PATCH 249/388] plugins: Rename gitstatusd plugin to gitstatus

---
 README.md                                |  2 +-
 lib/helpers.bash                         |  2 +-
 plugins/available/gitstatus.plugin.bash  | 23 +++++++++++++++++++++++
 plugins/available/gitstatusd.plugin.bash | 23 -----------------------
 template/bash_profile.template.bash      |  6 +++---
 test/lib/search.bats                     |  2 +-
 themes/base.theme.bash                   | 18 +++++++++---------
 themes/githelpers.theme.bash             | 12 ++++++------
 8 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 plugins/available/gitstatus.plugin.bash
 delete mode 100644 plugins/available/gitstatusd.plugin.bash

diff --git a/README.md b/README.md
index 314e77b8..a696894e 100644
--- a/README.md
+++ b/README.md
@@ -397,7 +397,7 @@ Setting this flag globally has the same effect as `SCM_CHECK=true`, but only for
 
 ### Speed up git status calculations
 
-As an alternative to ignoring repo status entirely, you can try out the `gitstatusd` plugin.
+As an alternative to ignoring repo status entirely, you can try out the `gitstatus` plugin.
 This plugin speeds up all `git status` calculations by up to 10x times!
 
 **NOTE**: You will need to clone `gitstatus` repo from [here](https://github.com/romkatv/gitstatus).
diff --git a/lib/helpers.bash b/lib/helpers.bash
index 9c4b3c43..f3bd2e0b 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -322,7 +322,7 @@ _on-disable-callback()
 {
     _about 'Calls the disabled plugin destructor, if present'
     _param '1: plugin name'
-    _example '$ _on-disable-callback gitstatusd'
+    _example '$ _on-disable-callback gitstatus'
     _group 'lib'
 
     callback=$1_on_disable
diff --git a/plugins/available/gitstatus.plugin.bash b/plugins/available/gitstatus.plugin.bash
new file mode 100644
index 00000000..d48d0569
--- /dev/null
+++ b/plugins/available/gitstatus.plugin.bash
@@ -0,0 +1,23 @@
+cite about-plugin
+about-plugin 'speeds up your life by using gitstatus for git status calculations. install from https://github.com/romkatv/gitstatus'
+
+
+function gitstatus_on_disable() {
+  about 'Destructor of gitstatus plugin'
+  group 'gitstatus'
+
+  unset SCM_GIT_USE_GITSTATUS
+  gitstatus_stop
+}
+
+[[ "$SCM_CHECK" == "true" ]] || return # No scm-check
+
+[[ $- == *i* ]] || return  # non-interactive shell
+
+SCM_GIT_GITSTATUS_PLUGIN_SH_LOC=${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
+if [[ -f "${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC}" ]]; then
+  source "${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC}"
+  # Start the actual gitstatus binary
+  gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
+  export SCM_GIT_USE_GITSTATUS=true
+fi
diff --git a/plugins/available/gitstatusd.plugin.bash b/plugins/available/gitstatusd.plugin.bash
deleted file mode 100644
index 3551c6f9..00000000
--- a/plugins/available/gitstatusd.plugin.bash
+++ /dev/null
@@ -1,23 +0,0 @@
-cite about-plugin
-about-plugin 'speeds up your life by using gitstatusd for git status calculations. install from https://github.com/romkatv/gitstatus'
-
-
-function gitstatusd_on_disable() {
-  about 'Destructor of gitstatusd plugin'
-  group 'gitstatusd'
-
-  unset SCM_GIT_USE_GITSTATUSD
-  gitstatus_stop
-}
-
-[[ "$SCM_CHECK" == "true" ]] || return # No scm-check
-
-[[ $- == *i* ]] || return  # non-interactive shell
-
-SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC=${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
-if [[ -f "${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC}" ]]; then
-  source "${SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC}"
-  # Start the actual gitstatusd binary
-  gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
-  export SCM_GIT_USE_GITSTATUSD=true
-fi
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index 6fa8e516..40ac5c32 100755
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -32,9 +32,9 @@ export TODO="t"
 
 # Set this to false to turn off version control status checking within the prompt for all themes
 export SCM_CHECK=true
-# Set to actual location of gitstatusd.plugin.sh if installed
-#export SCM_GIT_GITSTATUSD_PLUGIN_SH_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
-# per default gitstatusd uses 2 times as many threads as CPU cores, you can change this here if you must
+# Set to actual location of gitstatus.plugin.sh if installed
+#export SCM_GIT_GITSTATUS_PLUGIN_SH_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
+# per default gitstatus uses 2 times as many threads as CPU cores, you can change this here if you must
 #export GITSTATUS_NUM_THREADS=8
 
 # Set Xterm/screen/Tmux title with only a short hostname.
diff --git a/test/lib/search.bats b/test/lib/search.bats
index 60c06be2..c7bda191 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -40,7 +40,7 @@ function local_teardown {
   run _bash-it-search 'git' --no-color
   assert_line -n 0 '      aliases:  git   gitsvn  '
   assert_line -n 1 -p '      plugins:'
-  for plugin in "autojump" "git" "gitstatusd" "git-subrepo" "jgitflow" "jump"
+  for plugin in "autojump" "git" "gitstatus" "git-subrepo" "jgitflow" "jump"
   do
     echo $plugin
     assert_line -n 1 -p $plugin
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 26527659..61671b51 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -34,8 +34,8 @@ SCM_GIT_SHOW_CURRENT_USER=${SCM_GIT_SHOW_CURRENT_USER:=false}
 SCM_GIT_SHOW_MINIMAL_INFO=${SCM_GIT_SHOW_MINIMAL_INFO:=false}
 SCM_GIT_SHOW_STASH_INFO=${SCM_GIT_SHOW_STASH_INFO:=true}
 SCM_GIT_SHOW_COMMIT_COUNT=${SCM_GIT_SHOW_COMMIT_COUNT:=true}
-SCM_GIT_USE_GITSTATUSD=${SCM_GIT_USE_GITSTATUSD:=false}
-SCM_GIT_GITSTATUSD_RAN=${SCM_GIT_GITSTATUSD_RAN:=false}
+SCM_GIT_USE_GITSTATUS=${SCM_GIT_USE_GITSTATUS:=false}
+SCM_GIT_GITSTATUS_RAN=${SCM_GIT_GITSTATUS_RAN:=false}
 
 SCM_GIT='git'
 SCM_GIT_CHAR='±'
@@ -193,10 +193,10 @@ function git_prompt_minimal_info {
 }
 
 function git_prompt_vars {
-  if ${SCM_GIT_USE_GITSTATUSD} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatusd
-    SCM_GIT_GITSTATUSD_RAN=true # use this in githelpers and below to choose gitstatusd output
+  if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatus
+    SCM_GIT_GITSTATUS_RAN=true # use this in githelpers and below to choose gitstatus output
   else
-    SCM_GIT_GITSTATUSD_RAN=false
+    SCM_GIT_GITSTATUS_RAN=false
   fi
 
   if _git-branch &> /dev/null; then
@@ -214,7 +214,7 @@ function git_prompt_vars {
     SCM_BRANCH="${detached_prefix}\$(_git-friendly-ref)"
   fi
 
-  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+  if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     commits_behind=${VCS_STATUS_COMMITS_BEHIND}
     commits_ahead=${VCS_STATUS_COMMITS_AHEAD}
   else
@@ -231,7 +231,7 @@ function git_prompt_vars {
 
   if [[ "${SCM_GIT_SHOW_STASH_INFO}" = "true" ]]; then
     local stash_count
-    if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
       stash_count=${VCS_STATUS_STASHES}
     else
       stash_count="$(git stash list 2> /dev/null | wc -l | tr -d ' ')"
@@ -241,7 +241,7 @@ function git_prompt_vars {
 
   SCM_STATE=${GIT_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
   if ! _git-hide-status; then
-    if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+    if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
       untracked_count=${VCS_STATUS_NUM_UNTRACKED}
       unstaged_count=${VCS_STATUS_NUM_UNSTAGED}
       staged_count=${VCS_STATUS_NUM_STAGED}
@@ -259,7 +259,7 @@ function git_prompt_vars {
     fi
   fi
 
-  # no if for gitstatusd here, user extraction is not supported by it
+  # no if for gitstatus here, user extraction is not supported by it
   [[ "${SCM_GIT_SHOW_CURRENT_USER}" == "true" ]] && SCM_BRANCH+="$(git_user_info)"
 
   SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
diff --git a/themes/githelpers.theme.bash b/themes/githelpers.theme.bash
index fd5b3ce7..2d5829ff 100644
--- a/themes/githelpers.theme.bash
+++ b/themes/githelpers.theme.bash
@@ -9,7 +9,7 @@ function _git-symbolic-ref {
 # same commit. _git-branch is used to explicitly choose the checked-out
 # branch.
 function _git-branch {
-  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+  if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     test -n "${VCS_STATUS_LOCAL_BRANCH}" && echo "${VCS_STATUS_LOCAL_BRANCH}" || return 1
   else 
     git symbolic-ref -q --short HEAD 2> /dev/null || return 1
@@ -17,7 +17,7 @@ function _git-branch {
 }
 
 function _git-tag {
-  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+  if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     test -n "${VCS_STATUS_TAG}" && echo "${VCS_STATUS_TAG}"
   else 
     git describe --tags --exact-match 2> /dev/null
@@ -29,7 +29,7 @@ function _git-commit-description {
 }
 
 function _git-short-sha {
-  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+  if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     echo ${VCS_STATUS_COMMIT:0:7}
   else
     git rev-parse --short HEAD
@@ -38,8 +38,8 @@ function _git-short-sha {
 
 # Try the checked-out branch first to avoid collision with branches pointing to the same ref.
 function _git-friendly-ref {
-  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
-    _git-branch || _git-tag || _git-short-sha # there is no tag based describe output in gitstatusd
+  if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
+    _git-branch || _git-tag || _git-short-sha # there is no tag based describe output in gitstatus
   else 
     _git-branch || _git-tag || _git-commit-description || _git-short-sha
   fi
@@ -119,7 +119,7 @@ function _git-status-counts {
 function _git-remote-info {
 
   # prompt handling only, reimplement because patching the routine below gets ugly
-  if [[ "${SCM_GIT_GITSTATUSD_RAN}" == "true" ]]; then
+  if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     [[ "${VCS_STATUS_REMOTE_NAME}" == "" ]] && return
     [[ "${VCS_STATUS_LOCAL_BRANCH}" == "${VCS_STATUS_REMOTE_BRANCH}" ]] && local same_branch_name=true
     local same_branch_name=

From d7aebe17a391331485021826603e08908ee13c2e Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 21 Jun 2020 14:10:14 +0300
Subject: [PATCH 250/388] plugins: Rename SCM_GIT_GITSTATUS_PLUGIN_SH_LOC to
 SCM_GIT_GITSTATUS_DIR

Also fix the destructor in case plugin did not load as expected
---
 plugins/available/gitstatus.plugin.bash | 8 ++++----
 template/bash_profile.template.bash     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/available/gitstatus.plugin.bash b/plugins/available/gitstatus.plugin.bash
index d48d0569..8e6558cd 100644
--- a/plugins/available/gitstatus.plugin.bash
+++ b/plugins/available/gitstatus.plugin.bash
@@ -7,16 +7,16 @@ function gitstatus_on_disable() {
   group 'gitstatus'
 
   unset SCM_GIT_USE_GITSTATUS
-  gitstatus_stop
+  _command_exists gitstatus_stop && gitstatus_stop
 }
 
 [[ "$SCM_CHECK" == "true" ]] || return # No scm-check
 
 [[ $- == *i* ]] || return  # non-interactive shell
 
-SCM_GIT_GITSTATUS_PLUGIN_SH_LOC=${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC:="$HOME/gitstatus/gitstatus.plugin.sh"}
-if [[ -f "${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC}" ]]; then
-  source "${SCM_GIT_GITSTATUS_PLUGIN_SH_LOC}"
+: ${SCM_GIT_GITSTATUS_DIR:="$HOME/gitstatus"}
+if [[ -d "${SCM_GIT_GITSTATUS_DIR}" ]]; then
+  source "${SCM_GIT_GITSTATUS_DIR}/gitstatus.plugin.sh"
   # Start the actual gitstatus binary
   gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
   export SCM_GIT_USE_GITSTATUS=true
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index 40ac5c32..f8f4705f 100755
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -32,8 +32,8 @@ export TODO="t"
 
 # Set this to false to turn off version control status checking within the prompt for all themes
 export SCM_CHECK=true
-# Set to actual location of gitstatus.plugin.sh if installed
-#export SCM_GIT_GITSTATUS_PLUGIN_SH_LOC="$HOME/gitstatus/gitstatus.plugin.sh"
+# Set to actual location of gitstatus directory if installed
+#export SCM_GIT_GITSTATUS_DIR="$HOME/gitstatus"
 # per default gitstatus uses 2 times as many threads as CPU cores, you can change this here if you must
 #export GITSTATUS_NUM_THREADS=8
 

From a697fd2c5321069c66496ca4c3204971dddd7e5d Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 22 Jun 2020 14:48:49 +0300
Subject: [PATCH 251/388] plugins: Tidy gitstatus plugin comments and code

---
 plugins/available/gitstatus.plugin.bash | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/available/gitstatus.plugin.bash b/plugins/available/gitstatus.plugin.bash
index 8e6558cd..98df693e 100644
--- a/plugins/available/gitstatus.plugin.bash
+++ b/plugins/available/gitstatus.plugin.bash
@@ -1,7 +1,6 @@
 cite about-plugin
 about-plugin 'speeds up your life by using gitstatus for git status calculations. install from https://github.com/romkatv/gitstatus'
 
-
 function gitstatus_on_disable() {
   about 'Destructor of gitstatus plugin'
   group 'gitstatus'
@@ -10,12 +9,14 @@ function gitstatus_on_disable() {
   _command_exists gitstatus_stop && gitstatus_stop
 }
 
-[[ "$SCM_CHECK" == "true" ]] || return # No scm-check
+# No scm-check
+[[ $SCM_CHECK == "true" ]] || return
 
-[[ $- == *i* ]] || return  # non-interactive shell
+# non-interactive shell
+[[ $- == *i* ]] || return
 
-: ${SCM_GIT_GITSTATUS_DIR:="$HOME/gitstatus"}
-if [[ -d "${SCM_GIT_GITSTATUS_DIR}" ]]; then
+: "${SCM_GIT_GITSTATUS_DIR:="$HOME/gitstatus"}"
+if [[ -d ${SCM_GIT_GITSTATUS_DIR} ]]; then
   source "${SCM_GIT_GITSTATUS_DIR}/gitstatus.plugin.sh"
   # Start the actual gitstatus binary
   gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1

From 802c45b4017e6bde4e1352a1cba4bf7588740e2d Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 19:28:52 +0300
Subject: [PATCH 252/388] lib: Add log module

---
 lib/log.bash | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 lib/log.bash

diff --git a/lib/log.bash b/lib/log.bash
new file mode 100644
index 00000000..dc9a544a
--- /dev/null
+++ b/lib/log.bash
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+export BASH_IT_LOG_LEVEL_ERROR=1
+export BASH_IT_LOG_LEVEL_WARNING=2
+export BASH_IT_LOG_LEVEL_ALL=3
+
+function _log_general()
+{
+  _about 'Internal function used for logging'
+  _param '1: message to log'
+  _group 'log'
+
+  echo -e "$1${echo_normal}"
+}
+
+function _log_debug()
+{
+  _about 'log a debug message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_ALL'
+  _param '1: message to log'
+  _example '$ _log_debug "Loading plugin git..."'
+  _group 'log'
+
+  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ALL ]] || return
+  _log_general "${echo_green}DEBUG: $1"
+}
+
+function _log_warning()
+{
+  _about 'log a message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_WARNING'
+  _param '1: message to log'
+  _example '$ _log_warning "git binary not found, disabling git plugin..."'
+  _group 'log'
+
+  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_WARNING ]] || return
+  _log_general "${echo_yellow} WARN: $1"
+}
+
+function _log_error()
+{
+  _about 'log a message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_ERROR'
+  _param '1: message to log'
+  _example '$ _log_error "Failed to load git plugin..."'
+  _group 'log'
+
+  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ERROR ]] || return
+  _log_general "${echo_red}ERROR: $1"
+}

From 86824a93eddf2b5ffd5fa443187bac4036198277 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 20:09:18 +0300
Subject: [PATCH 253/388] helpers: Add bash-it doctor command

---
 lib/helpers.bash | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index f3bd2e0b..2d05c919 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -43,7 +43,7 @@ alias reload_plugins="$(_make_reload_alias plugin plugins)"
 bash-it ()
 {
     about 'Bash-it help and maintenance'
-    param '1: verb [one of: help | show | enable | disable | migrate | update | search | version | reload ] '
+    param '1: verb [one of: help | show | enable | disable | migrate | update | search | version | reload | doctor ] '
     param '2: component type [one of: alias(es) | completion(s) | plugin(s) ] or search term(s)'
     param '3: specific component [optional]'
     example '$ bash-it show plugins'
@@ -55,6 +55,7 @@ bash-it ()
     example '$ bash-it search [-|@]term1 [-|@]term2 ... [ -e/--enable ] [ -d/--disable ] [ -r/--refresh ] [ -c/--no-color ]'
     example '$ bash-it version'
     example '$ bash-it reload'
+    example '$ bash-it doctor errors|warnings|all'
     typeset verb=${1:-}
     shift
     typeset component=${1:-}
@@ -70,6 +71,8 @@ bash-it ()
         func=_disable-$component;;
       help)
         func=_help-$component;;
+      doctor)
+        func=_bash-it-doctor-$component;;
       search)
         _bash-it-search $component "$@"
         return;;
@@ -263,6 +266,44 @@ _bash-it-version() {
   cd - &> /dev/null || return
 }
 
+_bash-it-doctor() {
+  _about 'reloads a profile file with a BASH_IT_LOG_LEVEL set'
+  _param '1: BASH_IT_LOG_LEVEL argument: "errors" "warnings" "all"'
+  _group 'lib'
+
+  BASH_IT_LOG_LEVEL=$1
+  _bash-it-reload
+  unset BASH_IT_LOG_LEVEL
+}
+
+_bash-it-doctor-all() {
+  _about 'reloads a profile file with error, warning and debug logs'
+  _group 'lib'
+
+  _bash-it-doctor $BASH_IT_LOG_LEVEL_ALL
+}
+
+_bash-it-doctor-warnings() {
+  _about 'reloads a profile file with error and warning logs'
+  _group 'lib'
+
+  _bash-it-doctor $BASH_IT_LOG_LEVEL_WARNING
+}
+
+_bash-it-doctor-errors() {
+  _about 'reloads a profile file with error logs'
+  _group 'lib'
+
+  _bash-it-doctor $BASH_IT_LOG_LEVEL_ERROR
+}
+
+_bash-it-doctor-() {
+  _about 'default bash-it doctor behavior, behaves like bash-it doctor all'
+  _group 'lib'
+
+  _bash-it-doctor-all
+}
+
 _bash-it-reload() {
   _about 'reloads a profile file'
   _group 'lib'

From 1e674643b304bdf9dab8e692e49d1b6d5a3a707f Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 20:15:12 +0300
Subject: [PATCH 254/388] completion: Add bash-it doctor completion

Also fix the tests and add a new one
---
 completion/available/bash-it.completion.bash |  7 ++++++-
 test/completion/bash-it.completion.bats      | 17 +++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/completion/available/bash-it.completion.bash b/completion/available/bash-it.completion.bash
index 71ec8418..c13e8623 100644
--- a/completion/available/bash-it.completion.bash
+++ b/completion/available/bash-it.completion.bash
@@ -65,7 +65,7 @@ _bash-it-comp()
   prev="${COMP_WORDS[COMP_CWORD-1]}"
   chose_opt="${COMP_WORDS[1]}"
   file_type="${COMP_WORDS[2]}"
-  opts="disable enable help migrate reload search show update version"
+  opts="disable enable help migrate reload doctor search show update version"
   case "${chose_opt}" in
     show)
       local show_args="aliases completions plugins"
@@ -82,6 +82,11 @@ _bash-it-comp()
         return 0
       fi
       ;;
+    doctor)
+      local doctor_args="errors warnings all"
+      COMPREPLY=( $(compgen -W "${doctor_args}" -- ${cur}) )
+      return 0
+      ;;
     migrate | reload | search | update | version)
       return 0
       ;;
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index 87c697e4..e453ae43 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -43,6 +43,11 @@ function __check_completion () {
   echo "${COMPREPLY[@]}"
 }
 
+@test "completion bash-it: doctor - show options" {
+  run __check_completion 'bash-it doctor '
+  assert_line -n 0 "errors warnings all"
+}
+
 @test "completion bash-it: help - show options" {
   run __check_completion 'bash-it help '
   assert_line -n 0 "aliases completions migrate plugins update"
@@ -70,32 +75,32 @@ function __check_completion () {
 
 @test "completion bash-it: show options" {
   run __check_completion 'bash-it '
-  assert_line -n 0 "disable enable help migrate reload search show update version"
+  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
 }
 
 @test "completion bash-it: bash-ti - show options" {
   run __check_completion 'bash-ti '
-  assert_line -n 0 "disable enable help migrate reload search show update version"
+  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
 }
 
 @test "completion bash-it: shit - show options" {
   run __check_completion 'shit '
-  assert_line -n 0 "disable enable help migrate reload search show update version"
+  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
 }
 
 @test "completion bash-it: bashit - show options" {
   run __check_completion 'bashit '
-  assert_line -n 0 "disable enable help migrate reload search show update version"
+  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
 }
 
 @test "completion bash-it: batshit - show options" {
   run __check_completion 'batshit '
-  assert_line -n 0 "disable enable help migrate reload search show update version"
+  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
 }
 
 @test "completion bash-it: bash_it - show options" {
   run __check_completion 'bash_it '
-  assert_line -n 0 "disable enable help migrate reload search show update version"
+  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
 }
 
 @test "completion bash-it: show - show options" {

From 862c1547939e3e4d91ff5e3f0829fc7301a0a3a4 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 20 Jun 2020 20:36:12 +0300
Subject: [PATCH 255/388] docs: Add bash-it doctor and logs documentation

---
 DEVELOPMENT.md |  9 +++++++++
 README.md      | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 33276b71..5328cc78 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -2,6 +2,15 @@
 
 This page summarizes a couple of rules to keep in mind when developing features or making changes in Bash-it.
 
+## Debugging and Logging
+
+While developing feature or making changes in general, you can log error/warning/debug
+using `_log_error` `_log_warning` and `_log_debug`. This will help you solve problems quicker
+and also propagate important notes to other users of Bash-it.
+You can see the logs by using `bash-it doctor` command to reload and see the logs.
+Alternatively, you can set `BASH_IT_LOG_LEVEL` to `BASH_IT_LOG_LEVEL_ERROR`, `BASH_IT_LOG_LEVEL_WARNING` or `BASH_IT_LOG_LEVEL_ALL`.
+
+
 ## Load Order
 
 ### General Load Order
diff --git a/README.md b/README.md
index a696894e..26ac5cb7 100644
--- a/README.md
+++ b/README.md
@@ -417,6 +417,20 @@ Unset `BASH_IT_LEGACY_PASS` to have Bash-it **return to default behavior**:
 
 * `unset BASH_IT_LEGACY_PASS`
 
+### Debugging
+
+If you encounter problems with any part of Bash-it, run the following command:
+```bash
+bash-it doctor
+```
+This will reload your bash profile and print out logs of various parts in Bash-it.
+Note that this command at default will print all logs, including debug logs.
+You can call it like this:
+```bash
+bash-it doctor [errors/warnings/all]
+```
+In order to get wanted verbosity.
+
 ### Proxy Support
 
 If you are working in a corporate environment where you have to go through a proxy server for internet access,

From 3e7a95660f82683d23599db434386424c5cd2ee5 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 23 Jun 2020 15:42:22 +0300
Subject: [PATCH 256/388] lib: Add _has_colors function and use it in log
 output

---
 lib/appearance.bash | 10 ++++++++++
 lib/log.bash        | 11 ++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/appearance.bash b/lib/appearance.bash
index 6d0ef2ff..d684332f 100644
--- a/lib/appearance.bash
+++ b/lib/appearance.bash
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+function _has_colors()
+{
+    # Check that stdout is a terminal
+    test -t 1 || return 1
+
+    ncolors=$(tput colors)
+    test -n "$ncolors" && test "$ncolors" -ge 8 || return 1
+    return 0
+}
+
 # colored ls
 export LSCOLORS='Gxfxcxdxdxegedabagacad'
 
diff --git a/lib/log.bash b/lib/log.bash
index dc9a544a..8f954359 100644
--- a/lib/log.bash
+++ b/lib/log.bash
@@ -7,10 +7,11 @@ export BASH_IT_LOG_LEVEL_ALL=3
 function _log_general()
 {
   _about 'Internal function used for logging'
-  _param '1: message to log'
+  _param '1: color of the message'
+  _param '2: message to log'
   _group 'log'
 
-  echo -e "$1${echo_normal}"
+  _has_colors && echo -e "$1$2${echo_normal}" || echo -e "$2"
 }
 
 function _log_debug()
@@ -21,7 +22,7 @@ function _log_debug()
   _group 'log'
 
   [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ALL ]] || return
-  _log_general "${echo_green}DEBUG: $1"
+  _log_general "${echo_green}" "DEBUG: $1"
 }
 
 function _log_warning()
@@ -32,7 +33,7 @@ function _log_warning()
   _group 'log'
 
   [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_WARNING ]] || return
-  _log_general "${echo_yellow} WARN: $1"
+  _log_general "${echo_yellow}" " WARN: $1"
 }
 
 function _log_error()
@@ -43,5 +44,5 @@ function _log_error()
   _group 'log'
 
   [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ERROR ]] || return
-  _log_general "${echo_red}ERROR: $1"
+  _log_general "${echo_red}" "ERROR: $1"
 }

From 5263f5ac59ced0db302bc99beb0f00359749508a Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 23 Jun 2020 15:59:14 +0300
Subject: [PATCH 257/388] test: Add lib log basic testing

---
 test/lib/log.bats | 79 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 test/lib/log.bats

diff --git a/test/lib/log.bats b/test/lib/log.bats
new file mode 100644
index 00000000..da31a9b5
--- /dev/null
+++ b/test/lib/log.bats
@@ -0,0 +1,79 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+load ../../lib/composure
+load ../../lib/appearance
+load ../../plugins/available/base.plugin
+
+cite _about _param _example _group _author _version
+load ../../lib/log
+
+@test "lib log: basic debug logging with BASH_IT_LOG_LEVEL_ALL" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ALL
+  run _log_debug "test test test"
+  assert_output "DEBUG: test test test"
+}
+
+@test "lib log: basic warning logging with BASH_IT_LOG_LEVEL_ALL" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ALL
+  run _log_warning "test test test"
+  assert_output " WARN: test test test"
+}
+
+@test "lib log: basic error logging with BASH_IT_LOG_LEVEL_ALL" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ALL
+  run _log_error "test test test"
+  assert_output "ERROR: test test test"
+}
+
+@test "lib log: basic debug logging with BASH_IT_LOG_LEVEL_WARNING" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_WARNING
+  run _log_debug "test test test"
+  refute_output
+}
+
+@test "lib log: basic warning logging with BASH_IT_LOG_LEVEL_WARNING" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_WARNING
+  run _log_warning "test test test"
+  assert_output " WARN: test test test"
+}
+
+@test "lib log: basic error logging with BASH_IT_LOG_LEVEL_WARNING" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_WARNING
+  run _log_error "test test test"
+  assert_output "ERROR: test test test"
+}
+
+
+@test "lib log: basic debug logging with BASH_IT_LOG_LEVEL_ERROR" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ERROR
+  run _log_debug "test test test"
+  refute_output
+}
+
+@test "lib log: basic warning logging with BASH_IT_LOG_LEVEL_ERROR" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ERROR
+  run _log_warning "test test test"
+  refute_output
+}
+
+@test "lib log: basic error logging with BASH_IT_LOG_LEVEL_ERROR" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ERROR
+  run _log_error "test test test"
+  assert_output "ERROR: test test test"
+}
+
+@test "lib log: basic debug silent logging" {
+  run _log_debug "test test test"
+  refute_output
+}
+
+@test "lib log: basic warning silent logging" {
+  run _log_warning "test test test"
+  refute_output
+}
+
+@test "lib log: basic error silent logging" {
+  run _log_error "test test test"
+  refute_output
+}

From a224d65f5bfa410ffcc086354072aff0f1343498 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 24 Jun 2020 15:11:49 +0300
Subject: [PATCH 258/388] plugins: Fix quotes around prec_word agruments

---
 plugins/available/alias-completion.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/alias-completion.plugin.bash b/plugins/available/alias-completion.plugin.bash
index 349877e6..5e0ea7fe 100644
--- a/plugins/available/alias-completion.plugin.bash
+++ b/plugins/available/alias-completion.plugin.bash
@@ -71,7 +71,7 @@ function alias_completion {
                         # with the last word in the unaliased form, i.e.,
                         # alias_cmd + ' ' + alias_args.
                         if [[ \$COMP_LINE == \"\$prec_word \$compl_word\" ]]; then
-                            prec_word=\"$alias_cmd $alias_args\"
+                            prec_word='$alias_cmd $alias_args'
                             prec_word=\${prec_word#* }
                         fi
                         (( COMP_CWORD += ${#alias_arg_words[@]} ))

From 9a23725ce0f6bf79eedf7af72a96090ce51ab1c4 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 25 Jun 2020 00:09:19 +0300
Subject: [PATCH 259/388] log: Add BASH_IT_LOG_PREFIX option

Also add a new test to check it
---
 DEVELOPMENT.md    | 7 +++++++
 lib/log.bash      | 5 +++--
 test/lib/log.bats | 7 +++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 5328cc78..e2fc7bd5 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -4,12 +4,19 @@ This page summarizes a couple of rules to keep in mind when developing features
 
 ## Debugging and Logging
 
+### General Logging
+
 While developing feature or making changes in general, you can log error/warning/debug
 using `_log_error` `_log_warning` and `_log_debug`. This will help you solve problems quicker
 and also propagate important notes to other users of Bash-it.
 You can see the logs by using `bash-it doctor` command to reload and see the logs.
 Alternatively, you can set `BASH_IT_LOG_LEVEL` to `BASH_IT_LOG_LEVEL_ERROR`, `BASH_IT_LOG_LEVEL_WARNING` or `BASH_IT_LOG_LEVEL_ALL`.
 
+### Log Prefix/Context
+
+You can define `BASH_IT_LOG_PREFIX` in your files in order to a have a constant prefix before your logs.
+Note that we prefer to uses "tags" based logging, i.e `plugins: git: DEBUG: Loading git plugin`.
+
 
 ## Load Order
 
diff --git a/lib/log.bash b/lib/log.bash
index 8f954359..afc6b1ac 100644
--- a/lib/log.bash
+++ b/lib/log.bash
@@ -6,12 +6,13 @@ export BASH_IT_LOG_LEVEL_ALL=3
 
 function _log_general()
 {
-  _about 'Internal function used for logging'
+  _about 'Internal function used for logging, uses BASH_IT_LOG_PREFIX as a prefix'
   _param '1: color of the message'
   _param '2: message to log'
   _group 'log'
 
-  _has_colors && echo -e "$1$2${echo_normal}" || echo -e "$2"
+  message=${BASH_IT_LOG_PREFIX}$2
+  _has_colors && echo -e "$1${message}${echo_normal}" || echo -e "${message}"
 }
 
 function _log_debug()
diff --git a/test/lib/log.bats b/test/lib/log.bats
index da31a9b5..ad1cdf07 100644
--- a/test/lib/log.bats
+++ b/test/lib/log.bats
@@ -77,3 +77,10 @@ load ../../lib/log
   run _log_error "test test test"
   refute_output
 }
+
+@test "lib log: logging with prefix" {
+  BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ALL
+  BASH_IT_LOG_PREFIX="nice: prefix: "
+  run _log_debug "test test test"
+  assert_output "nice: prefix: DEBUG: test test test"
+}

From 0053f2782047c93d27f61c9eb57586b0b0df878e Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 28 Jun 2020 11:37:08 +0300
Subject: [PATCH 260/388] test: Add alias-completion plugin test

---
 test/plugins/alias-completion.plugin.bats | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 test/plugins/alias-completion.plugin.bats

diff --git a/test/plugins/alias-completion.plugin.bats b/test/plugins/alias-completion.plugin.bats
new file mode 100644
index 00000000..08efb1ff
--- /dev/null
+++ b/test/plugins/alias-completion.plugin.bats
@@ -0,0 +1,19 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+load ../../lib/composure
+load ../../completion/available/git.completion
+
+@test "alias-completion: See that aliases with double quotes and brackets do not break the plugin" {
+  alias gtest="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
+  load ../../plugins/available/alias-completion.plugin
+
+  assert_success
+}
+
+@test "alias-completion: See that aliases with single quotes and brackets do not break the plugin" {
+  alias gtest='git log --graph --pretty=format:"%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset" --abbrev-commit --date=relative'
+  load ../../plugins/available/alias-completion.plugin
+
+  assert_success
+}

From 453c17de3dd344163fb9502f805f9feda2fa9220 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 25 Jun 2020 00:45:24 +0300
Subject: [PATCH 261/388] bash-it: Add logs to bash-it.sh

---
 bash_it.sh | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/bash_it.sh b/bash_it.sh
index ab911019..fec92c8d 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 # Initialize Bash It
+BASH_IT_LOG_PREFIX="core: main: "
 
 # Only set $BASH_IT if it's not already set
 if [ -z "$BASH_IT" ];
 then
   # Setting $BASH to maintain backwards compatibility
-  # TODO: warn users that they should upgrade their .bash_profile
+  _log_warning "BASH_IT variable not initialized, please upgrade your bash-it version and reinstall it!"
   export BASH_IT=$BASH
   BASH="$(bash -c 'echo $BASH')"
   export BASH
@@ -14,11 +15,12 @@ fi
 # For backwards compatibility, look in old BASH_THEME location
 if [ -z "$BASH_IT_THEME" ];
 then
-  # TODO: warn users that they should upgrade their .bash_profile
+  _log_warning "BASH_IT_THEME variable not initialized, please upgrade your bash-it version and reinstall it!"
   export BASH_IT_THEME="$BASH_THEME";
   unset BASH_THEME;
 fi
 
+_log_debug "Loading composure..."
 # Load composure first, so we support function metadata
 # shellcheck source=./lib/composure.bash
 source "${BASH_IT}/lib/composure.bash"
@@ -27,11 +29,16 @@ source "${BASH_IT}/lib/composure.bash"
 cite _about _param _example _group _author _version
 
 # libraries, but skip appearance (themes) for now
+_log_debug "Loading libraries(except appearance)..."
 LIB="${BASH_IT}/lib/*.bash"
 APPEARANCE_LIB="${BASH_IT}/lib/appearance.bash"
 for _bash_it_config_file in $LIB
 do
   if [ "$_bash_it_config_file" != "$APPEARANCE_LIB" ]; then
+    filename=${_bash_it_config_file##*/}
+    filename=${filename%.bash}
+    BASH_IT_LOG_PREFIX="lib: ${filename}: "
+    _log_debug "Loading library file..."
     # shellcheck disable=SC1090
     source "$_bash_it_config_file"
   fi
@@ -51,36 +58,51 @@ done
 
 # Load theme, if a theme was set
 if [[ ! -z "${BASH_IT_THEME}" ]]; then
+  _log_debug "Loading \"${BASH_IT_THEME}\" theme..."
   # Load colors and helpers first so they can be used in base theme
+  BASH_IT_LOG_PREFIX="themes: colors: "
   # shellcheck source=./themes/colors.theme.bash
   source "${BASH_IT}/themes/colors.theme.bash"
+  BASH_IT_LOG_PREFIX="themes: githelpers: "
   # shellcheck source=./themes/githelpers.theme.bash
   source "${BASH_IT}/themes/githelpers.theme.bash"
+  BASH_IT_LOG_PREFIX="themes: p4helpers: "
   # shellcheck source=./themes/p4helpers.theme.bash
   source "${BASH_IT}/themes/p4helpers.theme.bash"
+  BASH_IT_LOG_PREFIX="themes: base: "
   # shellcheck source=./themes/base.theme.bash
   source "${BASH_IT}/themes/base.theme.bash"
 
+  BASH_IT_LOG_PREFIX="lib: appearance: "
   # appearance (themes) now, after all dependencies
   # shellcheck source=./lib/appearance.bash
   source "$APPEARANCE_LIB"
 fi
 
-# Load custom aliases, completion, plugins
+BASH_IT_LOG_PREFIX="core: main: "
+_log_debug "Loading custom aliases, completion, plugins..."
 for file_type in "aliases" "completion" "plugins"
 do
   if [ -e "${BASH_IT}/${file_type}/custom.${file_type}.bash" ]
   then
+    BASH_IT_LOG_PREFIX="${file_type}: custom: "
+    _log_debug "Loading component..."
     # shellcheck disable=SC1090
     source "${BASH_IT}/${file_type}/custom.${file_type}.bash"
   fi
 done
 
 # Custom
+BASH_IT_LOG_PREFIX="core: main: "
+_log_debug "Loading general custom files..."
 CUSTOM="${BASH_IT_CUSTOM:=${BASH_IT}/custom}/*.bash ${BASH_IT_CUSTOM:=${BASH_IT}/custom}/**/*.bash"
 for _bash_it_config_file in $CUSTOM
 do
   if [ -e "${_bash_it_config_file}" ]; then
+    filename=$(basename "${_bash_it_config_file}")
+    filename=${filename%*.bash}
+    BASH_IT_LOG_PREFIX="custom: $filename"
+    _log_debug "Loading custom file..."
     # shellcheck disable=SC1090
     source "$_bash_it_config_file"
   fi

From 6a4142ced7562716c96e82844fb62800e6230d2a Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 25 Jun 2020 00:57:02 +0300
Subject: [PATCH 262/388] scripts: Add logs to reloader.bash

---
 scripts/reloader.bash | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/reloader.bash b/scripts/reloader.bash
index b0fe7e41..9563e525 100644
--- a/scripts/reloader.bash
+++ b/scripts/reloader.bash
@@ -1,15 +1,26 @@
 #!/bin/bash
+BASH_IT_LOG_PREFIX="core: reloader: "
 pushd "${BASH_IT}" >/dev/null || exit 1
 
-# TODO: Add debugging output
+function _set-prefix-based-on-path()
+{
+  filename=$(_bash-it-get-component-name-from-path "$1")
+  extension=$(_bash-it-get-component-type-from-path "$1")
+  BASH_IT_LOG_PREFIX="$extension: $filename: "
+}
 
 if [ "$1" != "skip" ] && [ -d "./enabled" ]; then
   _bash_it_config_type=""
   if [[ "${1}" =~ ^(alias|completion|plugin)$ ]]; then
     _bash_it_config_type=$1
+    _log_debug "Loading enabled $1 components..."
+  else
+    _log_debug "Loading all enabled components..."
   fi
   for _bash_it_config_file in $(sort <(compgen -G "./enabled/*${_bash_it_config_type}.bash")); do
     if [ -e "${_bash_it_config_file}" ]; then
+      _set-prefix-based-on-path "${_bash_it_config_file}"
+      _log_debug "Loading component..."
       # shellcheck source=/dev/null
       source $_bash_it_config_file
     else
@@ -20,9 +31,11 @@ fi
 
 
 if [ ! -z "${2}" ] && [[ "${2}" =~ ^(aliases|completion|plugins)$ ]] && [ -d "${2}/enabled" ]; then
-  # TODO: We should warn users they're using legacy enabling
+  _log_warning "Using legacy enabling for $2, please update your bash-it version and migrate"
   for _bash_it_config_file in $(sort <(compgen -G "./${2}/enabled/*.bash")); do
     if [ -e "$_bash_it_config_file" ]; then
+      _set-prefix-based-on-path "${_bash_it_config_file}"
+      _log_debug "Loading component..."
       # shellcheck source=/dev/null
       source "$_bash_it_config_file"
     else

From 5daecc9381e2a7d881b0d220e2aa774f4d31a7ab Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 25 Jun 2020 01:36:12 +0300
Subject: [PATCH 263/388] lib: Log in case _command_exists fails

---
 lib/helpers.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 2d05c919..2459e02b 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -21,7 +21,7 @@ function _command_exists ()
   _param '1: command to check'
   _example '$ _command_exists ls && echo exists'
   _group 'lib'
-  type "$1" &> /dev/null ;
+  type "$1" &> /dev/null || (_log_warning "Command $1 does not exist!" && return 1) ;
 }
 
 function _make_reload_alias() {

From 8a3cf763074309647fa4f5615af2c5a54fedbb19 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Sat, 27 Jun 2020 14:01:47 +0300
Subject: [PATCH 264/388] lib: Move _has_colors to log module

---
 lib/appearance.bash | 10 ----------
 lib/log.bash        | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/appearance.bash b/lib/appearance.bash
index d684332f..6d0ef2ff 100644
--- a/lib/appearance.bash
+++ b/lib/appearance.bash
@@ -1,15 +1,5 @@
 #!/usr/bin/env bash
 
-function _has_colors()
-{
-    # Check that stdout is a terminal
-    test -t 1 || return 1
-
-    ncolors=$(tput colors)
-    test -n "$ncolors" && test "$ncolors" -ge 8 || return 1
-    return 0
-}
-
 # colored ls
 export LSCOLORS='Gxfxcxdxdxegedabagacad'
 
diff --git a/lib/log.bash b/lib/log.bash
index afc6b1ac..856ec9aa 100644
--- a/lib/log.bash
+++ b/lib/log.bash
@@ -4,6 +4,16 @@ export BASH_IT_LOG_LEVEL_ERROR=1
 export BASH_IT_LOG_LEVEL_WARNING=2
 export BASH_IT_LOG_LEVEL_ALL=3
 
+function _has_colors()
+{
+  # Check that stdout is a terminal
+  test -t 1 || return 1
+
+  ncolors=$(tput colors)
+  test -n "$ncolors" && test "$ncolors" -ge 8 || return 1
+  return 0
+}
+
 function _log_general()
 {
   _about 'Internal function used for logging, uses BASH_IT_LOG_PREFIX as a prefix'

From 811c9ecd716382df14f1a6e03ddf3eee1b5d6693 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Sat, 27 Jun 2020 14:02:20 +0300
Subject: [PATCH 265/388] bash-it: Reorder main bash-it.sh so logs can happen

---
 bash_it.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bash_it.sh b/bash_it.sh
index fec92c8d..8a277bed 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -6,12 +6,22 @@ BASH_IT_LOG_PREFIX="core: main: "
 if [ -z "$BASH_IT" ];
 then
   # Setting $BASH to maintain backwards compatibility
-  _log_warning "BASH_IT variable not initialized, please upgrade your bash-it version and reinstall it!"
   export BASH_IT=$BASH
   BASH="$(bash -c 'echo $BASH')"
   export BASH
+  BASH_IT_OLD_BASH_SETUP=true
 fi
 
+# Load composure first, so we support function metadata
+# shellcheck source=./lib/composure.bash
+source "${BASH_IT}/lib/composure.bash"
+# We need to load logging module first as well in order to be able to log
+# shellcheck source=./lib/log.bash
+source "${BASH_IT}/lib/log.bash"
+
+# We can only log it now
+[ -z "$BASH_IT_OLD_BASH_SETUP" ] || _log_warning "BASH_IT variable not initialized, please upgrade your bash-it version and reinstall it!"
+
 # For backwards compatibility, look in old BASH_THEME location
 if [ -z "$BASH_IT_THEME" ];
 then
@@ -20,11 +30,6 @@ then
   unset BASH_THEME;
 fi
 
-_log_debug "Loading composure..."
-# Load composure first, so we support function metadata
-# shellcheck source=./lib/composure.bash
-source "${BASH_IT}/lib/composure.bash"
-
 # support 'plumbing' metadata
 cite _about _param _example _group _author _version
 

From 8d9f81fce09eb248885dad903bcf61d0fe614514 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Sat, 27 Jun 2020 15:28:47 +0300
Subject: [PATCH 266/388] lib: Add get-component-name/type-from-path

---
 lib/utilities.bash | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/utilities.bash b/lib/utilities.bash
index 7994a731..db63956d 100644
--- a/lib/utilities.bash
+++ b/lib/utilities.bash
@@ -6,6 +6,24 @@
 # Generic utilies
 ###########################################################################
 
+_bash-it-get-component-name-from-path() {
+  # filename without path
+  filename=${1##*/}
+  # filename without path or priority
+  filename=${filename##*---}
+  # filename without path, priority or extension
+  echo ${filename%.*.bash}
+}
+
+_bash-it-get-component-type-from-path() {
+  # filename without path
+  filename=${1##*/}
+  # filename without path or priority
+  filename=${filename##*---}
+  # extension
+  echo ${filename} | cut -d '.' -f 2
+}
+
 # This function searches an array for an exact match against the term passed
 # as the first argument to the function. This function exits as soon as
 # a match is found.

From e6ebcda6086faef4929302be76cb4b2ac6e7a21f Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 28 Jun 2020 11:14:30 +0300
Subject: [PATCH 267/388] log: Fix logging to comply with the tests

---
 lib/log.bash                    | 38 ++++++++++++++++-----------------
 test/themes/base.theme.git.bats |  1 +
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lib/log.bash b/lib/log.bash
index 856ec9aa..882bc5f9 100644
--- a/lib/log.bash
+++ b/lib/log.bash
@@ -16,10 +16,10 @@ function _has_colors()
 
 function _log_general()
 {
-  _about 'Internal function used for logging, uses BASH_IT_LOG_PREFIX as a prefix'
-  _param '1: color of the message'
-  _param '2: message to log'
-  _group 'log'
+  about 'Internal function used for logging, uses BASH_IT_LOG_PREFIX as a prefix'
+  param '1: color of the message'
+  param '2: message to log'
+  group 'log'
 
   message=${BASH_IT_LOG_PREFIX}$2
   _has_colors && echo -e "$1${message}${echo_normal}" || echo -e "${message}"
@@ -27,33 +27,33 @@ function _log_general()
 
 function _log_debug()
 {
-  _about 'log a debug message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_ALL'
-  _param '1: message to log'
-  _example '$ _log_debug "Loading plugin git..."'
-  _group 'log'
+  about 'log a debug message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_ALL'
+  param '1: message to log'
+  example '$ _log_debug "Loading plugin git..."'
+  group 'log'
 
-  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ALL ]] || return
+  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ALL ]] || return 0
   _log_general "${echo_green}" "DEBUG: $1"
 }
 
 function _log_warning()
 {
-  _about 'log a message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_WARNING'
-  _param '1: message to log'
-  _example '$ _log_warning "git binary not found, disabling git plugin..."'
-  _group 'log'
+  about 'log a message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_WARNING'
+  param '1: message to log'
+  example '$ _log_warning "git binary not found, disabling git plugin..."'
+  group 'log'
 
-  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_WARNING ]] || return
+  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_WARNING ]] || return 0
   _log_general "${echo_yellow}" " WARN: $1"
 }
 
 function _log_error()
 {
-  _about 'log a message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_ERROR'
-  _param '1: message to log'
-  _example '$ _log_error "Failed to load git plugin..."'
-  _group 'log'
+  about 'log a message by echoing to the screen. needs BASH_IT_LOG_LEVEL >= BASH_IT_LOG_LEVEL_ERROR'
+  param '1: message to log'
+  example '$ _log_error "Failed to load git plugin..."'
+  group 'log'
 
-  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ERROR ]] || return
+  [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ERROR ]] || return 0
   _log_general "${echo_red}" "ERROR: $1"
 }
diff --git a/test/themes/base.theme.git.bats b/test/themes/base.theme.git.bats
index 940121cc..ce86d2a1 100644
--- a/test/themes/base.theme.git.bats
+++ b/test/themes/base.theme.git.bats
@@ -2,6 +2,7 @@
 
 load ../test_helper
 load ../../lib/composure
+load ../../lib/log
 
 cite _about _param _example _group _author _version
 

From 3069af37e0b2ad1c600167780b383c78b4ca606b Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 28 Jun 2020 11:15:00 +0300
Subject: [PATCH 268/388] tests: Include lib log

---
 test/lib/helpers.bats           | 1 +
 test/themes/base.theme.bats     | 1 +
 test/themes/base.theme.svn.bats | 1 +
 3 files changed, 3 insertions(+)

diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index c3f905e7..e452c38e 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -2,6 +2,7 @@
 
 load ../test_helper
 load ../../lib/composure
+load ../../lib/log
 load ../../lib/utilities
 load ../../lib/search
 load ../../plugins/available/base.plugin
diff --git a/test/themes/base.theme.bats b/test/themes/base.theme.bats
index 2cf809dc..aa64904a 100644
--- a/test/themes/base.theme.bats
+++ b/test/themes/base.theme.bats
@@ -2,6 +2,7 @@
 
 load ../test_helper
 load ../../lib/composure
+load ../../lib/log
 
 cite _about _param _example _group _author _version
 
diff --git a/test/themes/base.theme.svn.bats b/test/themes/base.theme.svn.bats
index 89279d1b..b797da02 100644
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -2,6 +2,7 @@
 
 load ../test_helper
 load ../../lib/composure
+load ../../lib/log
 
 cite _about _param _example _group _author _version
 

From 72dbfd24805c6323df02d92e932ac2c37fdd2c88 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 2 Jul 2020 13:52:02 +0300
Subject: [PATCH 269/388] lib: log: Insert log level before message prefix

Also fix tests accordinly
---
 lib/log.bash      | 11 ++++++-----
 test/lib/log.bats |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/log.bash b/lib/log.bash
index 882bc5f9..105c9064 100644
--- a/lib/log.bash
+++ b/lib/log.bash
@@ -18,10 +18,11 @@ function _log_general()
 {
   about 'Internal function used for logging, uses BASH_IT_LOG_PREFIX as a prefix'
   param '1: color of the message'
-  param '2: message to log'
+  param '2: log level to print before the prefix'
+  param '3: message to log'
   group 'log'
 
-  message=${BASH_IT_LOG_PREFIX}$2
+  message=$2${BASH_IT_LOG_PREFIX}$3
   _has_colors && echo -e "$1${message}${echo_normal}" || echo -e "${message}"
 }
 
@@ -33,7 +34,7 @@ function _log_debug()
   group 'log'
 
   [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ALL ]] || return 0
-  _log_general "${echo_green}" "DEBUG: $1"
+  _log_general "${echo_green}" "DEBUG: " "$1"
 }
 
 function _log_warning()
@@ -44,7 +45,7 @@ function _log_warning()
   group 'log'
 
   [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_WARNING ]] || return 0
-  _log_general "${echo_yellow}" " WARN: $1"
+  _log_general "${echo_yellow}" " WARN: " "$1"
 }
 
 function _log_error()
@@ -55,5 +56,5 @@ function _log_error()
   group 'log'
 
   [[ "$BASH_IT_LOG_LEVEL" -ge $BASH_IT_LOG_LEVEL_ERROR ]] || return 0
-  _log_general "${echo_red}" "ERROR: $1"
+  _log_general "${echo_red}" "ERROR: " "$1"
 }
diff --git a/test/lib/log.bats b/test/lib/log.bats
index ad1cdf07..5afb9195 100644
--- a/test/lib/log.bats
+++ b/test/lib/log.bats
@@ -82,5 +82,5 @@ load ../../lib/log
   BASH_IT_LOG_LEVEL=$BASH_IT_LOG_LEVEL_ALL
   BASH_IT_LOG_PREFIX="nice: prefix: "
   run _log_debug "test test test"
-  assert_output "nice: prefix: DEBUG: test test test"
+  assert_output "DEBUG: nice: prefix: test test test"
 }

From e0ee6bd32f54974a81a17094fb25bad2c26cc3fe Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 7 Jul 2020 13:17:17 +0200
Subject: [PATCH 270/388] Added missing colon and space while loading custom
 files

Looks like I missed this during my review, @NoahGorny
---
 bash_it.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash_it.sh b/bash_it.sh
index 8a277bed..310aae42 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -106,7 +106,7 @@ do
   if [ -e "${_bash_it_config_file}" ]; then
     filename=$(basename "${_bash_it_config_file}")
     filename=${filename%*.bash}
-    BASH_IT_LOG_PREFIX="custom: $filename"
+    BASH_IT_LOG_PREFIX="custom: $filename: "
     _log_debug "Loading custom file..."
     # shellcheck disable=SC1090
     source "$_bash_it_config_file"

From 1c06c0ab6149ced5881803fb999398517fe2d6cf Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Wed, 8 Jul 2020 11:32:12 -0500
Subject: [PATCH 271/388] cleanup node plugin, and make it play nice with
 nodenv

---
 plugins/available/node.plugin.bash | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/available/node.plugin.bash b/plugins/available/node.plugin.bash
index 429ca458..65df3da3 100644
--- a/plugins/available/node.plugin.bash
+++ b/plugins/available/node.plugin.bash
@@ -1,7 +1,13 @@
 cite about-plugin
 about-plugin 'Node.js helper functions'
 
+# Ensure local modules are preferred in PATH
 pathmunge "./node_modules/.bin" "after"
 
-# Make sure the global npm prefix is on the path
-[[ `which npm 2>/dev/null` ]] && pathmunge "$(npm config get prefix)/bin" "after"
+# Check that we have npm
+out=$(command -v npm 2>&1) || return
+
+# If not using nodenv, ensure global modules are in PATH
+if [[ ! $out == *"nodenv/shims"* ]] ; then
+  pathmunge "$(npm config get prefix)/bin" "after"
+fi

From e9c01e18438b058fcb5043ce2269e2718499fe25 Mon Sep 17 00:00:00 2001
From: KID the Euforia <kid0725+github@gmail.com>
Date: Thu, 9 Jul 2020 18:49:24 +0900
Subject: [PATCH 272/388] completion/ssh: support sftp command

Signed-off-by: KID the Euforia <kid0725+github@gmail.com>
---
 completion/available/ssh.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/ssh.completion.bash b/completion/available/ssh.completion.bash
index 4c47277b..0e066091 100644
--- a/completion/available/ssh.completion.bash
+++ b/completion/available/ssh.completion.bash
@@ -37,4 +37,4 @@ _sshcomplete() {
     return 0
 }
 
-complete -o default -o nospace -F _sshcomplete ssh scp slogin
+complete -o default -o nospace -F _sshcomplete ssh scp slogin sftp

From ca409b699db3f566b45352f0bda54dc827865074 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sun, 12 Jul 2020 12:33:29 -0500
Subject: [PATCH 273/388] minor cleanups to fzf plugin

---
 plugins/available/fzf.plugin.bash | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/available/fzf.plugin.bash b/plugins/available/fzf.plugin.bash
index 4c672bbc..8ec1a467 100644
--- a/plugins/available/fzf.plugin.bash
+++ b/plugins/available/fzf.plugin.bash
@@ -4,14 +4,16 @@
 cite about-plugin
 about-plugin 'load fzf, if you are using it'
 
-if [ -f ~/.fzf.bash ]; then
+_command_exists fzf || return
+
+if [ -r ~/.fzf.bash ]; then
   source ~/.fzf.bash
-elif [ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then
+elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then
   source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
 fi
 
-if [ -z ${FZF_DEFAULT_COMMAND+x}  ]; then
-  command -v fd &> /dev/null && export FZF_DEFAULT_COMMAND='fd --type f'
+if [ -z ${FZF_DEFAULT_COMMAND+x}  ] && _command_exists fd ; then
+  export FZF_DEFAULT_COMMAND='fd --type f'
 fi
 
 fe() {

From cf47e1f93e641da7af2b4a44d5ba6d6e11d58128 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sun, 12 Jul 2020 12:37:00 -0500
Subject: [PATCH 274/388] nit pick spacing

---
 plugins/available/fzf.plugin.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/available/fzf.plugin.bash b/plugins/available/fzf.plugin.bash
index 8ec1a467..c4f5ea84 100644
--- a/plugins/available/fzf.plugin.bash
+++ b/plugins/available/fzf.plugin.bash
@@ -6,9 +6,9 @@ about-plugin 'load fzf, if you are using it'
 
 _command_exists fzf || return
 
-if [ -r ~/.fzf.bash ]; then
+if [ -r ~/.fzf.bash ] ; then
   source ~/.fzf.bash
-elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then
+elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ] ; then
   source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
 fi
 

From 4734505af8d35a538fdb0c9fd8407f8f02014d8f Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sun, 12 Jul 2020 16:20:50 -0500
Subject: [PATCH 275/388] add logging for improperly prepared environments and
 better error handling.

---
 completion/available/projects.completion.bash | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/completion/available/projects.completion.bash b/completion/available/projects.completion.bash
index 71d740cd..4d148704 100644
--- a/completion/available/projects.completion.bash
+++ b/completion/available/projects.completion.bash
@@ -1,5 +1,13 @@
+# Ensure that we log to doctor so the user can address these issues
+_is_function _init_completion ||
+  _log_error '_init_completion not found. Ensure bash-completion 2.0 or newer is installed and configured properly.'
+_is_function _rl_enabled ||
+  _log_error '_rl_enabled not found. Ensure bash-completion 2.0 or newer is installed and configured properly.'
+
 _pj() {
-  [ -z "$PROJECT_PATHS" ] && return
+  _is_function _init_completion || return
+  _is_function _rl_enabled || return
+  [ -n "$PROJECT_PATHS" ] || return
   shift
   [ "$1" == "open" ] && shift
 

From 67d359d615467262b6731056cec8e7487f11036a Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sun, 12 Jul 2020 16:21:14 -0500
Subject: [PATCH 276/388] attempt to simplify the description

---
 plugins/available/projects.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/projects.plugin.bash b/plugins/available/projects.plugin.bash
index e4dc39e2..775ec813 100644
--- a/plugins/available/projects.plugin.bash
+++ b/plugins/available/projects.plugin.bash
@@ -1,5 +1,5 @@
 cite about-plugin
-about-plugin 'add "export PROJECT_PATHS=~/projects:~/intertrode/projects" to navigate quickly to your project directories with `pj` and `pjo`'
+about-plugin 'quickly navigate configured paths with `pj` and `pjo`. example: "export PROJECT_PATHS=~/projects:~/work/projects"'
 
 function pj {
 about 'navigate quickly to your various project directories'

From 6b66fbf88cc23b70b5b62facf0d7a5784626580d Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Thu, 30 Jul 2020 07:50:35 -0500
Subject: [PATCH 277/388] clean up jenv to follow the newer pattern

---
 plugins/available/jenv.plugin.bash | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/plugins/available/jenv.plugin.bash b/plugins/available/jenv.plugin.bash
index 08470688..773a9921 100644
--- a/plugins/available/jenv.plugin.bash
+++ b/plugins/available/jenv.plugin.bash
@@ -1,7 +1,22 @@
 cite about-plugin
 about-plugin 'load jenv, if you are using it'
 
-export JENV_ROOT="$HOME/.jenv"
-pathmunge "$JENV_ROOT/bin"
+# Don't modify the environment if we can't find the tool:
+# - Check if in $PATH already
+# - Check if installed manually to $JENV_ROOT
+# - Check if installed manually to $HOME
+_command_exists jenv ||
+  [[ -n "$JENV_ROOT" && -x "$JENV_ROOT/bin/jenv" ]] ||
+  [[ -x "$HOME/.jenv/bin/jenv" ]] ||
+  return
 
-if which jenv > /dev/null; then eval "$(jenv init - bash)"; fi
+# Set JENV_ROOT, if not already set
+export JENV_ROOT="${JENV_ROOT:-$HOME/.jenv}"
+
+# Add JENV_ROOT/bin to PATH, if that's where it's installed
+! _command_exists jenv &&
+  [[ -x "$JENV_ROOT/bin/jenv" ]] &&
+  pathmunge "$JENV_ROOT/bin"
+
+# Initialize jenv
+eval "$(jenv init - bash)"

From 97bb1fc7ba3cb49113b058a5acb9296544fb4bf2 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Mon, 3 Aug 2020 14:20:04 -0500
Subject: [PATCH 278/388] allow the caller to pass a custom log message when
 the command is not found

---
 lib/helpers.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 2459e02b..da3abc0a 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -19,9 +19,11 @@ function _command_exists ()
 {
   _about 'checks for existence of a command'
   _param '1: command to check'
+  _param '2: (optional) log message to include when command not found'
   _example '$ _command_exists ls && echo exists'
   _group 'lib'
-  type "$1" &> /dev/null || (_log_warning "Command $1 does not exist!" && return 1) ;
+  local msg="${2:-Command '$1' does not exist!}"
+  type "$1" &> /dev/null || (_log_warning "$msg" && return 1) ;
 }
 
 function _make_reload_alias() {

From e4b856b67bed8a6d0c5685b935ba67549cddc056 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Mon, 3 Aug 2020 17:41:21 -0500
Subject: [PATCH 279/388] use terraform to complete itself

---
 .../available/terraform.completion.bash       | 67 ++-----------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/completion/available/terraform.completion.bash b/completion/available/terraform.completion.bash
index 201b7267..1452fca8 100644
--- a/completion/available/terraform.completion.bash
+++ b/completion/available/terraform.completion.bash
@@ -1,65 +1,10 @@
 #!/usr/bin/env bash
-#
-# Bash completion for the terraform command
-#
-# Copyright (C) 2018 Vangelis Tasoulas
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-_terraform()
-{
-	local cur prev words cword opts
-	_get_comp_words_by_ref -n : cur prev words cword
-	COMPREPLY=()
-	opts=""
+# Make sure terraform is installed
+_command_exists terraform || return
 
-	if [[ ${cword} -eq 1 ]] ; then
+# Don't handle completion if it's already managed
+complete -p terraform &>/dev/null && return
 
-		# Options that do not start with a hyphen, are always starting with four spaces.
-		opts="$(terraform --help | grep -E '^\s\s\s\s\S' | awk '{print $1}')"
-		opts="${opts} --help --version"
-
-	elif [[ ${cword} -gt 1 ]] ; then
-
-		if [[ ${cword} -eq 2 && ${prev} == '--help' ]] ; then
-
-			opts="$(terraform --help | grep -E '^\s\s\s\s\S' | awk '{print $1}')"
-
-		elif [[ ${words[1]} != "--help" && ${words[1]} != "--version" && ${words[1]} != "version" ]] ; then
-
-			# Some commands accept hyphened parameters, ...
-			opts="$(terraform --help "${words[1]}" | grep -E '^\s+-' | awk '{print $1}' | awk -F '=' '{ if ($0 ~ /=/) {print $1"="} else {print $1} }')"
-			# but some other commands accept non-hyphened parameters.
-			opts="${opts} $(terraform --help "${words[1]}" | grep -E '^\s\s\s\s\S' | awk '{print $1}')"
-			# All of the commands accept the --help parameter which is not listed
-			# by the 'terraform --help <command>
-			opts="${opts} --help"
-
-		fi
-	fi
-
-	COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
-
-	if [[ ${#COMPREPLY[*]} -eq 1 ]] ; then
-		if [[ ${COMPREPLY[0]} == *= ]] ; then
-			# When only one completion is left, check if there is an equal sign.
-			# If an equal sign, then add no space after the autocompleted word.
-			compopt -o nospace
-		fi
-	fi
-	return 0
-}
-
-complete -F _terraform terraform
+# Terraform completes itself
+complete -C terraform terraform

From 2f91e95af62aa88ef7fddaa6d68857db8f36cc00 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Tue, 4 Aug 2020 10:58:25 +0200
Subject: [PATCH 280/388] Adding log library to search tests

This might help with #1635.
---
 test/lib/search.bats | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/lib/search.bats b/test/lib/search.bats
index c7bda191..04624043 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -2,6 +2,7 @@
 
 load ../test_helper
 load ../../lib/composure
+load ../../lib/log
 load ../../lib/helpers
 load ../../lib/utilities
 load ../../lib/search

From 03e9124edb661d2d833156628fc57ca51bc003e8 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Wed, 5 Aug 2020 10:36:29 +0200
Subject: [PATCH 281/388] Fixed test execution

---
 test/plugins/alias-completion.plugin.bats | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/plugins/alias-completion.plugin.bats b/test/plugins/alias-completion.plugin.bats
index 08efb1ff..76d4ed04 100644
--- a/test/plugins/alias-completion.plugin.bats
+++ b/test/plugins/alias-completion.plugin.bats
@@ -2,6 +2,11 @@
 
 load ../test_helper
 load ../../lib/composure
+load ../../lib/log
+load ../../lib/helpers
+
+cite _about _param _example _group _author _version
+
 load ../../completion/available/git.completion
 
 @test "alias-completion: See that aliases with double quotes and brackets do not break the plugin" {

From 42e9017df3abd2db630f27c34721c2156c4e6c56 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@users.noreply.github.com>
Date: Sat, 8 Aug 2020 15:14:41 -0500
Subject: [PATCH 282/388] simplify git completion to use system-provided
 completions only (#1635)

* simplify git completion to use system-provided completions only

* support ubuntu git completion

* only search non-system paths

* only operate on macos.

* no need to return 1 in a plugin

* make alias test happy

* make alias test happy

* make alias test happy

* pass exit code when capturing expected errors

* slightly more understandable code structure

* make better use of the new logging feature
---
 completion/available/git.completion.bash | 3411 +---------------------
 1 file changed, 32 insertions(+), 3379 deletions(-)

diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash
index 3f75364e..8c5c9ea3 100644
--- a/completion/available/git.completion.bash
+++ b/completion/available/git.completion.bash
@@ -1,3386 +1,39 @@
-# git bash completions v2.26.2
-# Completion file copied as-is from git contrib:
-# - https://github.com/git/git/releases/tag/v2.26.2
-# - git-2.26.2/contrib/completion/git-completion.bash
-# -------------------------------------------------------------------
-# bash/zsh completion support for core Git.
-#
-# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
-# Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
-# Distributed under the GNU General Public License, version 2.0.
-#
-# The contained completion routines provide support for completing:
-#
-#    *) local and remote branch names
-#    *) local and remote tag names
-#    *) .git/remotes file names
-#    *) git 'subcommands'
-#    *) git email aliases for git-send-email
-#    *) tree paths within 'ref:path/to/file' expressions
-#    *) file paths within current working directory and index
-#    *) common --long-options
-#
-# To use these routines:
-#
-#    1) Copy this file to somewhere (e.g. ~/.git-completion.bash).
-#    2) Add the following line to your .bashrc/.zshrc:
-#        source ~/.git-completion.bash
-#    3) Consider changing your PS1 to also show the current branch,
-#       see git-prompt.sh for details.
-#
-# If you use complex aliases of form '!f() { ... }; f', you can use the null
-# command ':' as the first command in the function body to declare the desired
-# completion style.  For example '!f() { : git commit ; ... }; f' will
-# tell the completion to use commit completion.  This also works with aliases
-# of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
-#
-# Compatible with bash 3.2.57.
-#
-# You can set the following environment variables to influence the behavior of
-# the completion routines:
-#
-#   GIT_COMPLETION_CHECKOUT_NO_GUESS
-#
-#     When set to "1", do not include "DWIM" suggestions in git-checkout
-#     and git-switch completion (e.g., completing "foo" when "origin/foo"
-#     exists).
+#!/usr/bin/env bash
 
-case "$COMP_WORDBREAKS" in
-*:*) : great ;;
-*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
-esac
-
-# Discovers the path to the git repository taking any '--git-dir=<path>' and
-# '-C <path>' options into account and stores it in the $__git_repo_path
-# variable.
-__git_find_repo_path ()
-{
-	if [ -n "$__git_repo_path" ]; then
-		# we already know where it is
-		return
-	fi
-
-	if [ -n "${__git_C_args-}" ]; then
-		__git_repo_path="$(git "${__git_C_args[@]}" \
-			${__git_dir:+--git-dir="$__git_dir"} \
-			rev-parse --absolute-git-dir 2>/dev/null)"
-	elif [ -n "${__git_dir-}" ]; then
-		test -d "$__git_dir" &&
-		__git_repo_path="$__git_dir"
-	elif [ -n "${GIT_DIR-}" ]; then
-		test -d "${GIT_DIR-}" &&
-		__git_repo_path="$GIT_DIR"
-	elif [ -d .git ]; then
-		__git_repo_path=.git
-	else
-		__git_repo_path="$(git rev-parse --git-dir 2>/dev/null)"
-	fi
-}
-
-# Deprecated: use __git_find_repo_path() and $__git_repo_path instead
-# __gitdir accepts 0 or 1 arguments (i.e., location)
-# returns location of .git repo
-__gitdir ()
-{
-	if [ -z "${1-}" ]; then
-		__git_find_repo_path || return 1
-		echo "$__git_repo_path"
-	elif [ -d "$1/.git" ]; then
-		echo "$1/.git"
-	else
-		echo "$1"
-	fi
-}
-
-# Runs git with all the options given as argument, respecting any
-# '--git-dir=<path>' and '-C <path>' options present on the command line
-__git ()
-{
-	git ${__git_C_args:+"${__git_C_args[@]}"} \
-		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
-}
-
-# Removes backslash escaping, single quotes and double quotes from a word,
-# stores the result in the variable $dequoted_word.
-# 1: The word to dequote.
-__git_dequote ()
-{
-	local rest="$1" len ch
-
-	dequoted_word=""
-
-	while test -n "$rest"; do
-		len=${#dequoted_word}
-		dequoted_word="$dequoted_word${rest%%[\\\'\"]*}"
-		rest="${rest:$((${#dequoted_word}-$len))}"
-
-		case "${rest:0:1}" in
-		\\)
-			ch="${rest:1:1}"
-			case "$ch" in
-			$'\n')
-				;;
-			*)
-				dequoted_word="$dequoted_word$ch"
-				;;
-			esac
-			rest="${rest:2}"
-			;;
-		\')
-			rest="${rest:1}"
-			len=${#dequoted_word}
-			dequoted_word="$dequoted_word${rest%%\'*}"
-			rest="${rest:$((${#dequoted_word}-$len+1))}"
-			;;
-		\")
-			rest="${rest:1}"
-			while test -n "$rest" ; do
-				len=${#dequoted_word}
-				dequoted_word="$dequoted_word${rest%%[\\\"]*}"
-				rest="${rest:$((${#dequoted_word}-$len))}"
-				case "${rest:0:1}" in
-				\\)
-					ch="${rest:1:1}"
-					case "$ch" in
-					\"|\\|\$|\`)
-						dequoted_word="$dequoted_word$ch"
-						;;
-					$'\n')
-						;;
-					*)
-						dequoted_word="$dequoted_word\\$ch"
-						;;
-					esac
-					rest="${rest:2}"
-					;;
-				\")
-					rest="${rest:1}"
-					break
-					;;
-				esac
-			done
-			;;
-		esac
-	done
-}
-
-# The following function is based on code from:
-#
-#   bash_completion - programmable completion functions for bash 3.2+
-#
-#   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
-#             © 2009-2010, Bash Completion Maintainers
-#                     <bash-completion-devel@lists.alioth.debian.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-#   The latest version of this software can be obtained here:
-#
-#   http://bash-completion.alioth.debian.org/
-#
-#   RELEASE: 2.x
-
-# This function can be used to access a tokenized list of words
-# on the command line:
-#
-#	__git_reassemble_comp_words_by_ref '=:'
-#	if test "${words_[cword_-1]}" = -w
-#	then
-#		...
-#	fi
-#
-# The argument should be a collection of characters from the list of
-# word completion separators (COMP_WORDBREAKS) to treat as ordinary
-# characters.
-#
-# This is roughly equivalent to going back in time and setting
-# COMP_WORDBREAKS to exclude those characters.  The intent is to
-# make option types like --date=<type> and <rev>:<path> easy to
-# recognize by treating each shell word as a single token.
-#
-# It is best not to set COMP_WORDBREAKS directly because the value is
-# shared with other completion scripts.  By the time the completion
-# function gets called, COMP_WORDS has already been populated so local
-# changes to COMP_WORDBREAKS have no effect.
-#
-# Output: words_, cword_, cur_.
-
-__git_reassemble_comp_words_by_ref()
-{
-	local exclude i j first
-	# Which word separators to exclude?
-	exclude="${1//[^$COMP_WORDBREAKS]}"
-	cword_=$COMP_CWORD
-	if [ -z "$exclude" ]; then
-		words_=("${COMP_WORDS[@]}")
-		return
-	fi
-	# List of word completion separators has shrunk;
-	# re-assemble words to complete.
-	for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
-		# Append each nonempty word consisting of just
-		# word separator characters to the current word.
-		first=t
-		while
-			[ $i -gt 0 ] &&
-			[ -n "${COMP_WORDS[$i]}" ] &&
-			# word consists of excluded word separators
-			[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
-		do
-			# Attach to the previous token,
-			# unless the previous token is the command name.
-			if [ $j -ge 2 ] && [ -n "$first" ]; then
-				((j--))
-			fi
-			first=
-			words_[$j]=${words_[j]}${COMP_WORDS[i]}
-			if [ $i = $COMP_CWORD ]; then
-				cword_=$j
-			fi
-			if (($i < ${#COMP_WORDS[@]} - 1)); then
-				((i++))
-			else
-				# Done.
-				return
-			fi
-		done
-		words_[$j]=${words_[j]}${COMP_WORDS[i]}
-		if [ $i = $COMP_CWORD ]; then
-			cword_=$j
-		fi
-	done
-}
-
-if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
-_get_comp_words_by_ref ()
-{
-	local exclude cur_ words_ cword_
-	if [ "$1" = "-n" ]; then
-		exclude=$2
-		shift 2
-	fi
-	__git_reassemble_comp_words_by_ref "$exclude"
-	cur_=${words_[cword_]}
-	while [ $# -gt 0 ]; do
-		case "$1" in
-		cur)
-			cur=$cur_
-			;;
-		prev)
-			prev=${words_[$cword_-1]}
-			;;
-		words)
-			words=("${words_[@]}")
-			;;
-		cword)
-			cword=$cword_
-			;;
-		esac
-		shift
-	done
-}
+# Only operate on MacOS since there are no linux paths
+if [[ "$(uname -s)" == 'Darwin' ]] ; then
+  _log_warning "unsupported operating system - only 'Darwin' is supported"
+  return 0
 fi
 
-# Fills the COMPREPLY array with prefiltered words without any additional
-# processing.
-# Callers must take care of providing only words that match the current word
-# to be completed and adding any prefix and/or suffix (trailing space!), if
-# necessary.
-# 1: List of newline-separated matching completion words, complete with
-#    prefix and suffix.
-__gitcomp_direct ()
-{
-	local IFS=$'\n'
+# Make sure git is installed
+_command_exists git || return 0
 
-	COMPREPLY=($1)
-}
-
-__gitcompappend ()
-{
-	local x i=${#COMPREPLY[@]}
-	for x in $1; do
-		if [[ "$x" == "$3"* ]]; then
-			COMPREPLY[i++]="$2$x$4"
-		fi
-	done
-}
-
-__gitcompadd ()
-{
-	COMPREPLY=()
-	__gitcompappend "$@"
-}
-
-# Generates completion reply, appending a space to possible completion words,
-# if necessary.
-# It accepts 1 to 4 arguments:
-# 1: List of possible completion words.
-# 2: A prefix to be added to each possible completion word (optional).
-# 3: Generate possible completion matches for this word (optional).
-# 4: A suffix to be appended to each possible completion word (optional).
-__gitcomp ()
-{
-	local cur_="${3-$cur}"
-
-	case "$cur_" in
-	--*=)
-		;;
-	--no-*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			if [[ $c == "--" ]]; then
-				continue
-			fi
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				--*=|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
-		done
-		;;
-	*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			if [[ $c == "--" ]]; then
-				c="--no-...${4-}"
-				if [[ $c == "$cur_"* ]]; then
-					COMPREPLY[i++]="${2-}$c "
-				fi
-				break
-			fi
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				*=|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
-		done
-		;;
-	esac
-}
-
-# Clear the variables caching builtins' options when (re-)sourcing
-# the completion script.
-if [[ -n ${ZSH_VERSION-} ]]; then
-	unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null
-else
-	unset $(compgen -v __gitcomp_builtin_)
+# Don't handle completion if it's already managed
+if complete -p git &>/dev/null ; then
+  _log_warning "completion already loaded - this usually means it is safe to stop using this completion"
+  return 0
 fi
 
-# This function is equivalent to
-#
-#    __gitcomp "$(git xxx --git-completion-helper) ..."
-#
-# except that the output is cached. Accept 1-3 arguments:
-# 1: the git command to execute, this is also the cache key
-# 2: extra options to be added on top (e.g. negative forms)
-# 3: options to be excluded
-__gitcomp_builtin ()
-{
-	# spaces must be replaced with underscore for multi-word
-	# commands, e.g. "git remote add" becomes remote_add.
-	local cmd="$1"
-	local incl="$2"
-	local excl="$3"
-
-	local var=__gitcomp_builtin_"${cmd/-/_}"
-	local options
-	eval "options=\$$var"
-
-	if [ -z "$options" ]; then
-		# leading and trailing spaces are significant to make
-		# option removal work correctly.
-		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return
-
-		for i in $excl; do
-			options="${options/ $i / }"
-		done
-		eval "$var=\"$options\""
-	fi
-
-	__gitcomp "$options"
-}
-
-# Variation of __gitcomp_nl () that appends to the existing list of
-# completion candidates, COMPREPLY.
-__gitcomp_nl_append ()
-{
-	local IFS=$'\n'
-	__gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }"
-}
-
-# Generates completion reply from newline-separated possible completion words
-# by appending a space to all of them.
-# It accepts 1 to 4 arguments:
-# 1: List of possible completion words, separated by a single newline.
-# 2: A prefix to be added to each possible completion word (optional).
-# 3: Generate possible completion matches for this word (optional).
-# 4: A suffix to be appended to each possible completion word instead of
-#    the default space (optional).  If specified but empty, nothing is
-#    appended.
-__gitcomp_nl ()
-{
-	COMPREPLY=()
-	__gitcomp_nl_append "$@"
-}
-
-# Fills the COMPREPLY array with prefiltered paths without any additional
-# processing.
-# Callers must take care of providing only paths that match the current path
-# to be completed and adding any prefix path components, if necessary.
-# 1: List of newline-separated matching paths, complete with all prefix
-#    path components.
-__gitcomp_file_direct ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY=($1)
-
-	# use a hack to enable file mode in bash < 4
-	compopt -o filenames +o nospace 2>/dev/null ||
-	compgen -f /non-existing-dir/ >/dev/null ||
-	true
-}
-
-# Generates completion reply with compgen from newline-separated possible
-# completion filenames.
-# It accepts 1 to 3 arguments:
-# 1: List of possible completion filenames, separated by a single newline.
-# 2: A directory prefix to be added to each possible completion filename
-#    (optional).
-# 3: Generate possible completion matches for this word (optional).
-__gitcomp_file ()
-{
-	local IFS=$'\n'
-
-	# XXX does not work when the directory prefix contains a tilde,
-	# since tilde expansion is not applied.
-	# This means that COMPREPLY will be empty and Bash default
-	# completion will be used.
-	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
-
-	# use a hack to enable file mode in bash < 4
-	compopt -o filenames +o nospace 2>/dev/null ||
-	compgen -f /non-existing-dir/ >/dev/null ||
-	true
-}
-
-# Execute 'git ls-files', unless the --committable option is specified, in
-# which case it runs 'git diff-index' to find out the files that can be
-# committed.  It return paths relative to the directory specified in the first
-# argument, and using the options specified in the second argument.
-__git_ls_files_helper ()
-{
-	if [ "$2" == "--committable" ]; then
-		__git -C "$1" -c core.quotePath=false diff-index \
-			--name-only --relative HEAD -- "${3//\\/\\\\}*"
-	else
-		# NOTE: $2 is not quoted in order to support multiple options
-		__git -C "$1" -c core.quotePath=false ls-files \
-			--exclude-standard $2 -- "${3//\\/\\\\}*"
-	fi
-}
-
-
-# __git_index_files accepts 1 or 2 arguments:
-# 1: Options to pass to ls-files (required).
-# 2: A directory path (optional).
-#    If provided, only files within the specified directory are listed.
-#    Sub directories are never recursed.  Path must have a trailing
-#    slash.
-# 3: List only paths matching this path component (optional).
-__git_index_files ()
-{
-	local root="$2" match="$3"
-
-	__git_ls_files_helper "$root" "$1" "$match" |
-	awk -F / -v pfx="${2//\\/\\\\}" '{
-		paths[$1] = 1
-	}
-	END {
-		for (p in paths) {
-			if (substr(p, 1, 1) != "\"") {
-				# No special characters, easy!
-				print pfx p
-				continue
-			}
-
-			# The path is quoted.
-			p = dequote(p)
-			if (p == "")
-				continue
-
-			# Even when a directory name itself does not contain
-			# any special characters, it will still be quoted if
-			# any of its (stripped) trailing path components do.
-			# Because of this we may have seen the same directory
-			# both quoted and unquoted.
-			if (p in paths)
-				# We have seen the same directory unquoted,
-				# skip it.
-				continue
-			else
-				print pfx p
-		}
-	}
-	function dequote(p,    bs_idx, out, esc, esc_idx, dec) {
-		# Skip opening double quote.
-		p = substr(p, 2)
-
-		# Interpret backslash escape sequences.
-		while ((bs_idx = index(p, "\\")) != 0) {
-			out = out substr(p, 1, bs_idx - 1)
-			esc = substr(p, bs_idx + 1, 1)
-			p = substr(p, bs_idx + 2)
-
-			if ((esc_idx = index("abtvfr\"\\", esc)) != 0) {
-				# C-style one-character escape sequence.
-				out = out substr("\a\b\t\v\f\r\"\\",
-						 esc_idx, 1)
-			} else if (esc == "n") {
-				# Uh-oh, a newline character.
-				# We cannot reliably put a pathname
-				# containing a newline into COMPREPLY,
-				# and the newline would create a mess.
-				# Skip this path.
-				return ""
-			} else {
-				# Must be a \nnn octal value, then.
-				dec = esc             * 64 + \
-				      substr(p, 1, 1) * 8  + \
-				      substr(p, 2, 1)
-				out = out sprintf("%c", dec)
-				p = substr(p, 3)
-			}
-		}
-		# Drop closing double quote, if there is one.
-		# (There is not any if this is a directory, as it was
-		# already stripped with the trailing path components.)
-		if (substr(p, length(p), 1) == "\"")
-			out = out substr(p, 1, length(p) - 1)
-		else
-			out = out p
-
-		return out
-	}'
-}
-
-# __git_complete_index_file requires 1 argument:
-# 1: the options to pass to ls-file
-#
-# The exception is --committable, which finds the files appropriate commit.
-__git_complete_index_file ()
-{
-	local dequoted_word pfx="" cur_
-
-	__git_dequote "$cur"
-
-	case "$dequoted_word" in
-	?*/*)
-		pfx="${dequoted_word%/*}/"
-		cur_="${dequoted_word##*/}"
-		;;
-	*)
-		cur_="$dequoted_word"
-	esac
-
-	__gitcomp_file_direct "$(__git_index_files "$1" "$pfx" "$cur_")"
-}
-
-# Lists branches from the local repository.
-# 1: A prefix to be added to each listed branch (optional).
-# 2: List only branches matching this word (optional; list all branches if
-#    unset or empty).
-# 3: A suffix to be appended to each listed branch (optional).
-__git_heads ()
-{
-	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
-
-	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
-			"refs/heads/$cur_*" "refs/heads/$cur_*/**"
-}
-
-# Lists tags from the local repository.
-# Accepts the same positional parameters as __git_heads() above.
-__git_tags ()
-{
-	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
-
-	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
-			"refs/tags/$cur_*" "refs/tags/$cur_*/**"
-}
-
-# Lists refs from the local (by default) or from a remote repository.
-# It accepts 0, 1 or 2 arguments:
-# 1: The remote to list refs from (optional; ignored, if set but empty).
-#    Can be the name of a configured remote, a path, or a URL.
-# 2: In addition to local refs, list unique branches from refs/remotes/ for
-#    'git checkout's tracking DWIMery (optional; ignored, if set but empty).
-# 3: A prefix to be added to each listed ref (optional).
-# 4: List only refs matching this word (optional; list all refs if unset or
-#    empty).
-# 5: A suffix to be appended to each listed ref (optional; ignored, if set
-#    but empty).
-#
-# Use __git_complete_refs() instead.
-__git_refs ()
-{
-	local i hash dir track="${2-}"
-	local list_refs_from=path remote="${1-}"
-	local format refs
-	local pfx="${3-}" cur_="${4-$cur}" sfx="${5-}"
-	local match="${4-}"
-	local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers
-
-	__git_find_repo_path
-	dir="$__git_repo_path"
-
-	if [ -z "$remote" ]; then
-		if [ -z "$dir" ]; then
-			return
-		fi
-	else
-		if __git_is_configured_remote "$remote"; then
-			# configured remote takes precedence over a
-			# local directory with the same name
-			list_refs_from=remote
-		elif [ -d "$remote/.git" ]; then
-			dir="$remote/.git"
-		elif [ -d "$remote" ]; then
-			dir="$remote"
-		else
-			list_refs_from=url
-		fi
-	fi
-
-	if [ "$list_refs_from" = path ]; then
-		if [[ "$cur_" == ^* ]]; then
-			pfx="$pfx^"
-			fer_pfx="$fer_pfx^"
-			cur_=${cur_#^}
-			match=${match#^}
-		fi
-		case "$cur_" in
-		refs|refs/*)
-			format="refname"
-			refs=("$match*" "$match*/**")
-			track=""
-			;;
-		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
-				case "$i" in
-				$match*)
-					if [ -e "$dir/$i" ]; then
-						echo "$pfx$i$sfx"
-					fi
-					;;
-				esac
-			done
-			format="refname:strip=2"
-			refs=("refs/tags/$match*" "refs/tags/$match*/**"
-				"refs/heads/$match*" "refs/heads/$match*/**"
-				"refs/remotes/$match*" "refs/remotes/$match*/**")
-			;;
-		esac
-		__git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \
-			"${refs[@]}"
-		if [ -n "$track" ]; then
-			# employ the heuristic used by git checkout
-			# Try to find a remote branch that matches the completion word
-			# but only output if the branch name is unique
-			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
-				--sort="refname:strip=3" \
-				"refs/remotes/*/$match*" "refs/remotes/*/$match*/**" | \
-			uniq -u
-		fi
-		return
-	fi
-	case "$cur_" in
-	refs|refs/*)
-		__git ls-remote "$remote" "$match*" | \
-		while read -r hash i; do
-			case "$i" in
-			*^{}) ;;
-			*) echo "$pfx$i$sfx" ;;
-			esac
-		done
-		;;
-	*)
-		if [ "$list_refs_from" = remote ]; then
-			case "HEAD" in
-			$match*)	echo "${pfx}HEAD$sfx" ;;
-			esac
-			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
-				"refs/remotes/$remote/$match*" \
-				"refs/remotes/$remote/$match*/**"
-		else
-			local query_symref
-			case "HEAD" in
-			$match*)	query_symref="HEAD" ;;
-			esac
-			__git ls-remote "$remote" $query_symref \
-				"refs/tags/$match*" "refs/heads/$match*" \
-				"refs/remotes/$match*" |
-			while read -r hash i; do
-				case "$i" in
-				*^{})	;;
-				refs/*)	echo "$pfx${i#refs/*/}$sfx" ;;
-				*)	echo "$pfx$i$sfx" ;;  # symbolic refs
-				esac
-			done
-		fi
-		;;
-	esac
-}
-
-# Completes refs, short and long, local and remote, symbolic and pseudo.
-#
-# Usage: __git_complete_refs [<option>]...
-# --remote=<remote>: The remote to list refs from, can be the name of a
-#                    configured remote, a path, or a URL.
-# --track: List unique remote branches for 'git checkout's tracking DWIMery.
-# --pfx=<prefix>: A prefix to be added to each ref.
-# --cur=<word>: The current ref to be completed.  Defaults to the current
-#               word to be completed.
-# --sfx=<suffix>: A suffix to be appended to each ref instead of the default
-#                 space.
-__git_complete_refs ()
-{
-	local remote track pfx cur_="$cur" sfx=" "
-
-	while test $# != 0; do
-		case "$1" in
-		--remote=*)	remote="${1##--remote=}" ;;
-		--track)	track="yes" ;;
-		--pfx=*)	pfx="${1##--pfx=}" ;;
-		--cur=*)	cur_="${1##--cur=}" ;;
-		--sfx=*)	sfx="${1##--sfx=}" ;;
-		*)		return 1 ;;
-		esac
-		shift
-	done
-
-	__gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx")"
-}
-
-# __git_refs2 requires 1 argument (to pass to __git_refs)
-# Deprecated: use __git_complete_fetch_refspecs() instead.
-__git_refs2 ()
-{
-	local i
-	for i in $(__git_refs "$1"); do
-		echo "$i:$i"
-	done
-}
-
-# Completes refspecs for fetching from a remote repository.
-# 1: The remote repository.
-# 2: A prefix to be added to each listed refspec (optional).
-# 3: The ref to be completed as a refspec instead of the current word to be
-#    completed (optional)
-# 4: A suffix to be appended to each listed refspec instead of the default
-#    space (optional).
-__git_complete_fetch_refspecs ()
-{
-	local i remote="$1" pfx="${2-}" cur_="${3-$cur}" sfx="${4- }"
-
-	__gitcomp_direct "$(
-		for i in $(__git_refs "$remote" "" "" "$cur_") ; do
-			echo "$pfx$i:$i$sfx"
-		done
-		)"
-}
-
-# __git_refs_remotes requires 1 argument (to pass to ls-remote)
-__git_refs_remotes ()
-{
-	local i hash
-	__git ls-remote "$1" 'refs/heads/*' | \
-	while read -r hash i; do
-		echo "$i:refs/remotes/$1/${i#refs/heads/}"
-	done
-}
-
-__git_remotes ()
-{
-	__git_find_repo_path
-	test -d "$__git_repo_path/remotes" && ls -1 "$__git_repo_path/remotes"
-	__git remote
-}
-
-# Returns true if $1 matches the name of a configured remote, false otherwise.
-__git_is_configured_remote ()
-{
-	local remote
-	for remote in $(__git_remotes); do
-		if [ "$remote" = "$1" ]; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-__git_list_merge_strategies ()
-{
-	LANG=C LC_ALL=C git merge -s help 2>&1 |
-	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
-		s/\.$//
-		s/.*://
-		s/^[ 	]*//
-		s/[ 	]*$//
-		p
-	}'
-}
-
-__git_merge_strategies=
-# 'git merge -s help' (and thus detection of the merge strategy
-# list) fails, unfortunately, if run outside of any git working
-# tree.  __git_merge_strategies is set to the empty string in
-# that case, and the detection will be repeated the next time it
-# is needed.
-__git_compute_merge_strategies ()
-{
-	test -n "$__git_merge_strategies" ||
-	__git_merge_strategies=$(__git_list_merge_strategies)
-}
-
-__git_merge_strategy_options="ours theirs subtree subtree= patience
-	histogram diff-algorithm= ignore-space-change ignore-all-space
-	ignore-space-at-eol renormalize no-renormalize no-renames
-	find-renames find-renames= rename-threshold="
-
-__git_complete_revlist_file ()
-{
-	local dequoted_word pfx ls ref cur_="$cur"
-	case "$cur_" in
-	*..?*:*)
-		return
-		;;
-	?*:*)
-		ref="${cur_%%:*}"
-		cur_="${cur_#*:}"
-
-		__git_dequote "$cur_"
-
-		case "$dequoted_word" in
-		?*/*)
-			pfx="${dequoted_word%/*}"
-			cur_="${dequoted_word##*/}"
-			ls="$ref:$pfx"
-			pfx="$pfx/"
-			;;
-		*)
-			cur_="$dequoted_word"
-			ls="$ref"
-			;;
-		esac
-
-		case "$COMP_WORDBREAKS" in
-		*:*) : great ;;
-		*)   pfx="$ref:$pfx" ;;
-		esac
-
-		__gitcomp_file "$(__git ls-tree "$ls" \
-				| sed 's/^.*	//
-				       s/$//')" \
-			"$pfx" "$cur_"
-		;;
-	*...*)
-		pfx="${cur_%...*}..."
-		cur_="${cur_#*...}"
-		__git_complete_refs --pfx="$pfx" --cur="$cur_"
-		;;
-	*..*)
-		pfx="${cur_%..*}.."
-		cur_="${cur_#*..}"
-		__git_complete_refs --pfx="$pfx" --cur="$cur_"
-		;;
-	*)
-		__git_complete_refs
-		;;
-	esac
-}
-
-__git_complete_file ()
-{
-	__git_complete_revlist_file
-}
-
-__git_complete_revlist ()
-{
-	__git_complete_revlist_file
-}
-
-__git_complete_remote_or_refspec ()
-{
-	local cur_="$cur" cmd="${words[1]}"
-	local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
-	if [ "$cmd" = "remote" ]; then
-		((c++))
-	fi
-	while [ $c -lt $cword ]; do
-		i="${words[c]}"
-		case "$i" in
-		--mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;;
-		-d|--delete) [ "$cmd" = "push" ] && lhs=0 ;;
-		--all)
-			case "$cmd" in
-			push) no_complete_refspec=1 ;;
-			fetch)
-				return
-				;;
-			*) ;;
-			esac
-			;;
-		--multiple) no_complete_refspec=1; break ;;
-		-*) ;;
-		*) remote="$i"; break ;;
-		esac
-		((c++))
-	done
-	if [ -z "$remote" ]; then
-		__gitcomp_nl "$(__git_remotes)"
-		return
-	fi
-	if [ $no_complete_refspec = 1 ]; then
-		return
-	fi
-	[ "$remote" = "." ] && remote=
-	case "$cur_" in
-	*:*)
-		case "$COMP_WORDBREAKS" in
-		*:*) : great ;;
-		*)   pfx="${cur_%%:*}:" ;;
-		esac
-		cur_="${cur_#*:}"
-		lhs=0
-		;;
-	+*)
-		pfx="+"
-		cur_="${cur_#+}"
-		;;
-	esac
-	case "$cmd" in
-	fetch)
-		if [ $lhs = 1 ]; then
-			__git_complete_fetch_refspecs "$remote" "$pfx" "$cur_"
-		else
-			__git_complete_refs --pfx="$pfx" --cur="$cur_"
-		fi
-		;;
-	pull|remote)
-		if [ $lhs = 1 ]; then
-			__git_complete_refs --remote="$remote" --pfx="$pfx" --cur="$cur_"
-		else
-			__git_complete_refs --pfx="$pfx" --cur="$cur_"
-		fi
-		;;
-	push)
-		if [ $lhs = 1 ]; then
-			__git_complete_refs --pfx="$pfx" --cur="$cur_"
-		else
-			__git_complete_refs --remote="$remote" --pfx="$pfx" --cur="$cur_"
-		fi
-		;;
-	esac
-}
-
-__git_complete_strategy ()
-{
-	__git_compute_merge_strategies
-	case "$prev" in
-	-s|--strategy)
-		__gitcomp "$__git_merge_strategies"
-		return 0
-		;;
-	-X)
-		__gitcomp "$__git_merge_strategy_options"
-		return 0
-		;;
-	esac
-	case "$cur" in
-	--strategy=*)
-		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
-		return 0
-		;;
-	--strategy-option=*)
-		__gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
-		return 0
-		;;
-	esac
-	return 1
-}
-
-__git_all_commands=
-__git_compute_all_commands ()
-{
-	test -n "$__git_all_commands" ||
-	__git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
-}
-
-# Lists all set config variables starting with the given section prefix,
-# with the prefix removed.
-__git_get_config_variables ()
-{
-	local section="$1" i IFS=$'\n'
-	for i in $(__git config --name-only --get-regexp "^$section\..*"); do
-		echo "${i#$section.}"
-	done
-}
-
-__git_pretty_aliases ()
-{
-	__git_get_config_variables "pretty"
-}
-
-# __git_aliased_command requires 1 argument
-__git_aliased_command ()
-{
-	local word cmdline=$(__git config --get "alias.$1")
-	for word in $cmdline; do
-		case "$word" in
-		\!gitk|gitk)
-			echo "gitk"
-			return
-			;;
-		\!*)	: shell command alias ;;
-		-*)	: option ;;
-		*=*)	: setting env ;;
-		git)	: git itself ;;
-		\(\))   : skip parens of shell function definition ;;
-		{)	: skip start of shell helper function ;;
-		:)	: skip null command ;;
-		\'*)	: skip opening quote after sh -c ;;
-		*)
-			echo "$word"
-			return
-		esac
-	done
-}
-
-# Check whether one of the given words is present on the command line,
-# and print the first word found.
-#
-# Usage: __git_find_on_cmdline [<option>]... "<wordlist>"
-# --show-idx: Optionally show the index of the found word in the $words array.
-__git_find_on_cmdline ()
-{
-	local word c=1 show_idx
-
-	while test $# -gt 1; do
-		case "$1" in
-		--show-idx)	show_idx=y ;;
-		*)		return 1 ;;
-		esac
-		shift
-	done
-	local wordlist="$1"
-
-	while [ $c -lt $cword ]; do
-		for word in $wordlist; do
-			if [ "$word" = "${words[c]}" ]; then
-				if [ -n "$show_idx" ]; then
-					echo "$c $word"
-				else
-					echo "$word"
-				fi
-				return
-			fi
-		done
-		((c++))
-	done
-}
-
-# Echo the value of an option set on the command line or config
-#
-# $1: short option name
-# $2: long option name including =
-# $3: list of possible values
-# $4: config string (optional)
-#
-# example:
-# result="$(__git_get_option_value "-d" "--do-something=" \
-#     "yes no" "core.doSomething")"
-#
-# result is then either empty (no option set) or "yes" or "no"
-#
-# __git_get_option_value requires 3 arguments
-__git_get_option_value ()
-{
-	local c short_opt long_opt val
-	local result= values config_key word
-
-	short_opt="$1"
-	long_opt="$2"
-	values="$3"
-	config_key="$4"
-
-	((c = $cword - 1))
-	while [ $c -ge 0 ]; do
-		word="${words[c]}"
-		for val in $values; do
-			if [ "$short_opt$val" = "$word" ] ||
-			   [ "$long_opt$val"  = "$word" ]; then
-				result="$val"
-				break 2
-			fi
-		done
-		((c--))
-	done
-
-	if [ -n "$config_key" ] && [ -z "$result" ]; then
-		result="$(__git config "$config_key")"
-	fi
-
-	echo "$result"
-}
-
-__git_has_doubledash ()
-{
-	local c=1
-	while [ $c -lt $cword ]; do
-		if [ "--" = "${words[c]}" ]; then
-			return 0
-		fi
-		((c++))
-	done
-	return 1
-}
-
-# Try to count non option arguments passed on the command line for the
-# specified git command.
-# When options are used, it is necessary to use the special -- option to
-# tell the implementation were non option arguments begin.
-# XXX this can not be improved, since options can appear everywhere, as
-# an example:
-#	git mv x -n y
-#
-# __git_count_arguments requires 1 argument: the git command executed.
-__git_count_arguments ()
-{
-	local word i c=0
-
-	# Skip "git" (first argument)
-	for ((i=1; i < ${#words[@]}; i++)); do
-		word="${words[i]}"
-
-		case "$word" in
-			--)
-				# Good; we can assume that the following are only non
-				# option arguments.
-				((c = 0))
-				;;
-			"$1")
-				# Skip the specified git command and discard git
-				# main options
-				((c = 0))
-				;;
-			?*)
-				((c++))
-				;;
-		esac
-	done
-
-	printf "%d" $c
-}
-
-__git_whitespacelist="nowarn warn error error-all fix"
-__git_patchformat="mbox stgit stgit-series hg mboxrd"
-__git_showcurrentpatch="diff raw"
-__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
-
-_git_am ()
-{
-	__git_find_repo_path
-	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "$__git_am_inprogress_options"
-		return
-	fi
-	case "$cur" in
-	--whitespace=*)
-		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
-		return
-		;;
-	--patch-format=*)
-		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
-		return
-		;;
-	--show-current-patch=*)
-		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin am "" \
-			"$__git_am_inprogress_options"
-		return
-	esac
-}
-
-_git_apply ()
-{
-	case "$cur" in
-	--whitespace=*)
-		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin apply
-		return
-	esac
-}
-
-_git_add ()
-{
-	case "$cur" in
-	--chmod=*)
-		__gitcomp "+x -x" "" "${cur##--chmod=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin add
-		return
-	esac
-
-	local complete_opt="--others --modified --directory --no-empty-directory"
-	if test -n "$(__git_find_on_cmdline "-u --update")"
-	then
-		complete_opt="--modified"
-	fi
-	__git_complete_index_file "$complete_opt"
-}
-
-_git_archive ()
-{
-	case "$cur" in
-	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
-		return
-		;;
-	--remote=*)
-		__gitcomp_nl "$(__git_remotes)" "" "${cur##--remote=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes"
-		return
-		;;
-	esac
-	__git_complete_file
-}
-
-_git_bisect ()
-{
-	__git_has_doubledash && return
-
-	local subcommands="start bad good skip reset visualize replay log run"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
-		__git_find_repo_path
-		if [ -f "$__git_repo_path"/BISECT_START ]; then
-			__gitcomp "$subcommands"
-		else
-			__gitcomp "replay start"
-		fi
-		return
-	fi
-
-	case "$subcommand" in
-	bad|good|reset|skip|start)
-		__git_complete_refs
-		;;
-	*)
-		;;
-	esac
-}
-
-__git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD symref"
-
-_git_branch ()
-{
-	local i c=1 only_local_ref="n" has_r="n"
-
-	while [ $c -lt $cword ]; do
-		i="${words[c]}"
-		case "$i" in
-		-d|--delete|-m|--move)	only_local_ref="y" ;;
-		-r|--remotes)		has_r="y" ;;
-		esac
-		((c++))
-	done
-
-	case "$cur" in
-	--set-upstream-to=*)
-		__git_complete_refs --cur="${cur##--set-upstream-to=}"
-		;;
-	--*)
-		__gitcomp_builtin branch
-		;;
-	*)
-		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
-			__gitcomp_direct "$(__git_heads "" "$cur" " ")"
-		else
-			__git_complete_refs
-		fi
-		;;
-	esac
-}
-
-_git_bundle ()
-{
-	local cmd="${words[2]}"
-	case "$cword" in
-	2)
-		__gitcomp "create list-heads verify unbundle"
-		;;
-	3)
-		# looking for a file
-		;;
-	*)
-		case "$cmd" in
-			create)
-				__git_complete_revlist
-			;;
-		esac
-		;;
-	esac
-}
-
-_git_checkout ()
-{
-	__git_has_doubledash && return
-
-	case "$cur" in
-	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
-		;;
-	--*)
-		__gitcomp_builtin checkout
-		;;
-	*)
-		# check if --track, --no-track, or --no-guess was specified
-		# if so, disable DWIM mode
-		local flags="--track --no-track --no-guess" track_opt="--track"
-		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
-		   [ -n "$(__git_find_on_cmdline "$flags")" ]; then
-			track_opt=''
-		fi
-		__git_complete_refs $track_opt
-		;;
-	esac
-}
-
-__git_sequencer_inprogress_options="--continue --quit --abort --skip"
-
-__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
-
-_git_cherry_pick ()
-{
-	__git_find_repo_path
-	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "$__git_cherry_pick_inprogress_options"
-		return
-	fi
-
-	__git_complete_strategy && return
-
-	case "$cur" in
-	--*)
-		__gitcomp_builtin cherry-pick "" \
-			"$__git_cherry_pick_inprogress_options"
-		;;
-	*)
-		__git_complete_refs
-		;;
-	esac
-}
-
-_git_clean ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin clean
-		return
-		;;
-	esac
-
-	# XXX should we check for -x option ?
-	__git_complete_index_file "--others --directory"
-}
-
-_git_clone ()
-{
-	case "$prev" in
-	-c|--config)
-		__git_complete_config_variable_name_and_value
-		return
-		;;
-	esac
-	case "$cur" in
-	--config=*)
-		__git_complete_config_variable_name_and_value \
-			--cur="${cur##--config=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin clone
-		return
-		;;
-	esac
-}
-
-__git_untracked_file_modes="all no normal"
-
-_git_commit ()
-{
-	case "$prev" in
-	-c|-C)
-		__git_complete_refs
-		return
-		;;
-	esac
-
-	case "$cur" in
-	--cleanup=*)
-		__gitcomp "default scissors strip verbatim whitespace
-			" "" "${cur##--cleanup=}"
-		return
-		;;
-	--reuse-message=*|--reedit-message=*|\
-	--fixup=*|--squash=*)
-		__git_complete_refs --cur="${cur#*=}"
-		return
-		;;
-	--untracked-files=*)
-		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin commit
-		return
-	esac
-
-	if __git rev-parse --verify --quiet HEAD >/dev/null; then
-		__git_complete_index_file "--committable"
-	else
-		# This is the first commit
-		__git_complete_index_file "--cached"
-	fi
-}
-
-_git_describe ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin describe
-		return
-	esac
-	__git_complete_refs
-}
-
-__git_diff_algorithms="myers minimal patience histogram"
-
-__git_diff_submodule_formats="diff log short"
-
-__git_color_moved_opts="no default plain blocks zebra dimmed-zebra"
-
-__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change
-			ignore-all-space allow-indentation-change"
-
-__git_diff_common_options="--stat --numstat --shortstat --summary
-			--patch-with-stat --name-only --name-status --color
-			--no-color --color-words --no-renames --check
-			--color-moved --color-moved= --no-color-moved
-			--color-moved-ws= --no-color-moved-ws
-			--full-index --binary --abbrev --diff-filter=
-			--find-copies-harder --ignore-cr-at-eol
-			--text --ignore-space-at-eol --ignore-space-change
-			--ignore-all-space --ignore-blank-lines --exit-code
-			--quiet --ext-diff --no-ext-diff
-			--no-prefix --src-prefix= --dst-prefix=
-			--inter-hunk-context=
-			--patience --histogram --minimal
-			--raw --word-diff --word-diff-regex=
-			--dirstat --dirstat= --dirstat-by-file
-			--dirstat-by-file= --cumulative
-			--diff-algorithm=
-			--submodule --submodule= --ignore-submodules
-			--indent-heuristic --no-indent-heuristic
-			--textconv --no-textconv
-"
-
-_git_diff ()
-{
-	__git_has_doubledash && return
-
-	case "$cur" in
-	--diff-algorithm=*)
-		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
-		return
-		;;
-	--submodule=*)
-		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
-		return
-		;;
-	--color-moved=*)
-		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
-		return
-		;;
-	--color-moved-ws=*)
-		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
-		return
-		;;
-	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs --no-index
-			$__git_diff_common_options
-			"
-		return
-		;;
-	esac
-	__git_complete_revlist_file
-}
-
-__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
-			codecompare smerge
-"
-
-_git_difftool ()
-{
-	__git_has_doubledash && return
-
-	case "$cur" in
-	--tool=*)
-		__gitcomp "$__git_mergetools_common kompare" "" "${cur##--tool=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin difftool "$__git_diff_common_options
-					--base --cached --ours --theirs
-					--pickaxe-all --pickaxe-regex
-					--relative --staged
-					"
-		return
-		;;
-	esac
-	__git_complete_revlist_file
-}
-
-__git_fetch_recurse_submodules="yes on-demand no"
-
-_git_fetch ()
-{
-	case "$cur" in
-	--recurse-submodules=*)
-		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
-		return
-		;;
-	--filter=*)
-		__gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin fetch
-		return
-		;;
-	esac
-	__git_complete_remote_or_refspec
-}
-
-__git_format_patch_extra_options="
-	--full-index --not --all --no-prefix --src-prefix=
-	--dst-prefix= --notes
-"
-
-_git_format_patch ()
-{
-	case "$cur" in
-	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
-		return
-		;;
-	esac
-	__git_complete_revlist
-}
-
-_git_fsck ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin fsck
-		return
-		;;
-	esac
-}
-
-_git_gitk ()
-{
-	_gitk
-}
-
-# Lists matching symbol names from a tag (as in ctags) file.
-# 1: List symbol names matching this word.
-# 2: The tag file to list symbol names from.
-# 3: A prefix to be added to each listed symbol name (optional).
-# 4: A suffix to be appended to each listed symbol name (optional).
-__git_match_ctag () {
-	awk -v pfx="${3-}" -v sfx="${4-}" "
-		/^${1//\//\\/}/ { print pfx \$1 sfx }
-		" "$2"
-}
-
-# Complete symbol names from a tag file.
-# Usage: __git_complete_symbol [<option>]...
-# --tags=<file>: The tag file to list symbol names from instead of the
-#                default "tags".
-# --pfx=<prefix>: A prefix to be added to each symbol name.
-# --cur=<word>: The current symbol name to be completed.  Defaults to
-#               the current word to be completed.
-# --sfx=<suffix>: A suffix to be appended to each symbol name instead
-#                 of the default space.
-__git_complete_symbol () {
-	local tags=tags pfx="" cur_="${cur-}" sfx=" "
-
-	while test $# != 0; do
-		case "$1" in
-		--tags=*)	tags="${1##--tags=}" ;;
-		--pfx=*)	pfx="${1##--pfx=}" ;;
-		--cur=*)	cur_="${1##--cur=}" ;;
-		--sfx=*)	sfx="${1##--sfx=}" ;;
-		*)		return 1 ;;
-		esac
-		shift
-	done
-
-	if test -r "$tags"; then
-		__gitcomp_direct "$(__git_match_ctag "$cur_" "$tags" "$pfx" "$sfx")"
-	fi
-}
-
-_git_grep ()
-{
-	__git_has_doubledash && return
-
-	case "$cur" in
-	--*)
-		__gitcomp_builtin grep
-		return
-		;;
-	esac
-
-	case "$cword,$prev" in
-	2,*|*,-*)
-		__git_complete_symbol && return
-		;;
-	esac
-
-	__git_complete_refs
-}
-
-_git_help ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin help
-		return
-		;;
-	esac
-	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
-	then
-		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
-	else
-		__gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
-	fi
-}
-
-_git_init ()
-{
-	case "$cur" in
-	--shared=*)
-		__gitcomp "
-			false true umask group all world everybody
-			" "" "${cur##--shared=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin init
-		return
-		;;
-	esac
-}
-
-_git_ls_files ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin ls-files
-		return
-		;;
-	esac
-
-	# XXX ignore options like --modified and always suggest all cached
-	# files.
-	__git_complete_index_file "--cached"
-}
-
-_git_ls_remote ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin ls-remote
-		return
-		;;
-	esac
-	__gitcomp_nl "$(__git_remotes)"
-}
-
-_git_ls_tree ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin ls-tree
-		return
-		;;
-	esac
-
-	__git_complete_file
-}
-
-# Options that go well for log, shortlog and gitk
-__git_log_common_options="
-	--not --all
-	--branches --tags --remotes
-	--first-parent --merges --no-merges
-	--max-count=
-	--max-age= --since= --after=
-	--min-age= --until= --before=
-	--min-parents= --max-parents=
-	--no-min-parents --no-max-parents
-"
-# Options that go well for log and gitk (not shortlog)
-__git_log_gitk_options="
-	--dense --sparse --full-history
-	--simplify-merges --simplify-by-decoration
-	--left-right --notes --no-notes
-"
-# Options that go well for log and shortlog (not gitk)
-__git_log_shortlog_options="
-	--author= --committer= --grep=
-	--all-match --invert-grep
-"
-
-__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
-__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
-
-_git_log ()
-{
-	__git_has_doubledash && return
-	__git_find_repo_path
-
-	local merge=""
-	if [ -f "$__git_repo_path/MERGE_HEAD" ]; then
-		merge="--merge"
-	fi
-	case "$prev,$cur" in
-	-L,:*:*)
-		return	# fall back to Bash filename completion
-		;;
-	-L,:*)
-		__git_complete_symbol --cur="${cur#:}" --sfx=":"
-		return
-		;;
-	-G,*|-S,*)
-		__git_complete_symbol
-		return
-		;;
-	esac
-	case "$cur" in
-	--pretty=*|--format=*)
-		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
-			" "" "${cur#*=}"
-		return
-		;;
-	--date=*)
-		__gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
-		return
-		;;
-	--decorate=*)
-		__gitcomp "full short no" "" "${cur##--decorate=}"
-		return
-		;;
-	--diff-algorithm=*)
-		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
-		return
-		;;
-	--submodule=*)
-		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
-		return
-		;;
-	--no-walk=*)
-		__gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
-		return
-		;;
-	--*)
-		__gitcomp "
-			$__git_log_common_options
-			$__git_log_shortlog_options
-			$__git_log_gitk_options
-			--root --topo-order --date-order --reverse
-			--follow --full-diff
-			--abbrev-commit --no-abbrev-commit --abbrev=
-			--relative-date --date=
-			--pretty= --format= --oneline
-			--show-signature
-			--cherry-mark
-			--cherry-pick
-			--graph
-			--decorate --decorate= --no-decorate
-			--walk-reflogs
-			--no-walk --no-walk= --do-walk
-			--parents --children
-			--expand-tabs --expand-tabs= --no-expand-tabs
-			--patch
-			$merge
-			$__git_diff_common_options
-			--pickaxe-all --pickaxe-regex
-			"
-		return
-		;;
-	-L:*:*)
-		return	# fall back to Bash filename completion
-		;;
-	-L:*)
-		__git_complete_symbol --cur="${cur#-L:}" --sfx=":"
-		return
-		;;
-	-G*)
-		__git_complete_symbol --pfx="-G" --cur="${cur#-G}"
-		return
-		;;
-	-S*)
-		__git_complete_symbol --pfx="-S" --cur="${cur#-S}"
-		return
-		;;
-	esac
-	__git_complete_revlist
-}
-
-_git_merge ()
-{
-	__git_complete_strategy && return
-
-	case "$cur" in
-	--*)
-		__gitcomp_builtin merge
-		return
-	esac
-	__git_complete_refs
-}
-
-_git_mergetool ()
-{
-	case "$cur" in
-	--tool=*)
-		__gitcomp "$__git_mergetools_common tortoisemerge" "" "${cur##--tool=}"
-		return
-		;;
-	--*)
-		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
-		return
-		;;
-	esac
-}
-
-_git_merge_base ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin merge-base
-		return
-		;;
-	esac
-	__git_complete_refs
-}
-
-_git_mv ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin mv
-		return
-		;;
-	esac
-
-	if [ $(__git_count_arguments "mv") -gt 0 ]; then
-		# We need to show both cached and untracked files (including
-		# empty directories) since this may not be the last argument.
-		__git_complete_index_file "--cached --others --directory"
-	else
-		__git_complete_index_file "--cached"
-	fi
-}
-
-_git_notes ()
-{
-	local subcommands='add append copy edit get-ref list merge prune remove show'
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-
-	case "$subcommand,$cur" in
-	,--*)
-		__gitcomp_builtin notes
-		;;
-	,*)
-		case "$prev" in
-		--ref)
-			__git_complete_refs
-			;;
-		*)
-			__gitcomp "$subcommands --ref"
-			;;
-		esac
-		;;
-	*,--reuse-message=*|*,--reedit-message=*)
-		__git_complete_refs --cur="${cur#*=}"
-		;;
-	*,--*)
-		__gitcomp_builtin notes_$subcommand
-		;;
-	prune,*|get-ref,*)
-		# this command does not take a ref, do not complete it
-		;;
-	*)
-		case "$prev" in
-		-m|-F)
-			;;
-		*)
-			__git_complete_refs
-			;;
-		esac
-		;;
-	esac
-}
-
-_git_pull ()
-{
-	__git_complete_strategy && return
-
-	case "$cur" in
-	--recurse-submodules=*)
-		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin pull
-
-		return
-		;;
-	esac
-	__git_complete_remote_or_refspec
-}
-
-__git_push_recurse_submodules="check on-demand only"
-
-__git_complete_force_with_lease ()
-{
-	local cur_=$1
-
-	case "$cur_" in
-	--*=)
-		;;
-	*:*)
-		__git_complete_refs --cur="${cur_#*:}"
-		;;
-	*)
-		__git_complete_refs --cur="$cur_"
-		;;
-	esac
-}
-
-_git_push ()
-{
-	case "$prev" in
-	--repo)
-		__gitcomp_nl "$(__git_remotes)"
-		return
-		;;
-	--recurse-submodules)
-		__gitcomp "$__git_push_recurse_submodules"
-		return
-		;;
-	esac
-	case "$cur" in
-	--repo=*)
-		__gitcomp_nl "$(__git_remotes)" "" "${cur##--repo=}"
-		return
-		;;
-	--recurse-submodules=*)
-		__gitcomp "$__git_push_recurse_submodules" "" "${cur##--recurse-submodules=}"
-		return
-		;;
-	--force-with-lease=*)
-		__git_complete_force_with_lease "${cur##--force-with-lease=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin push
-		return
-		;;
-	esac
-	__git_complete_remote_or_refspec
-}
-
-_git_range_diff ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp "
-			--creation-factor= --no-dual-color
-			$__git_diff_common_options
-		"
-		return
-		;;
-	esac
-	__git_complete_revlist
-}
-
-__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch"
-__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo"
-
-_git_rebase ()
-{
-	__git_find_repo_path
-	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "$__git_rebase_interactive_inprogress_options"
-		return
-	elif [ -d "$__git_repo_path"/rebase-apply ] || \
-	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "$__git_rebase_inprogress_options"
-		return
-	fi
-	__git_complete_strategy && return
-	case "$cur" in
-	--whitespace=*)
-		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
-		return
-		;;
-	--onto=*)
-		__git_complete_refs --cur="${cur##--onto=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin rebase "" \
-			"$__git_rebase_interactive_inprogress_options"
-
-		return
-	esac
-	__git_complete_refs
-}
-
-_git_reflog ()
-{
-	local subcommands="show delete expire"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-
-	if [ -z "$subcommand" ]; then
-		__gitcomp "$subcommands"
-	else
-		__git_complete_refs
-	fi
-}
-
-__git_send_email_confirm_options="always never auto cc compose"
-__git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
-
-_git_send_email ()
-{
-	case "$prev" in
-	--to|--cc|--bcc|--from)
-		__gitcomp "$(__git send-email --dump-aliases)"
-		return
-		;;
-	esac
-
-	case "$cur" in
-	--confirm=*)
-		__gitcomp "
-			$__git_send_email_confirm_options
-			" "" "${cur##--confirm=}"
-		return
-		;;
-	--suppress-cc=*)
-		__gitcomp "
-			$__git_send_email_suppresscc_options
-			" "" "${cur##--suppress-cc=}"
-
-		return
-		;;
-	--smtp-encryption=*)
-		__gitcomp "ssl tls" "" "${cur##--smtp-encryption=}"
-		return
-		;;
-	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
-		return
-		;;
-	--to=*|--cc=*|--bcc=*|--from=*)
-		__gitcomp "$(__git send-email --dump-aliases)" "" "${cur#--*=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
-			--compose --confirm= --dry-run --envelope-sender
-			--from --identity
-			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet --reply-to
-			--signed-off-by-cc --smtp-pass --smtp-server
-			--smtp-server-port --smtp-encryption= --smtp-user
-			--subject --suppress-cc= --suppress-from --thread --to
-			--validate --no-validate
-			$__git_format_patch_extra_options"
-		return
-		;;
-	esac
-	__git_complete_revlist
-}
-
-_git_stage ()
-{
-	_git_add
-}
-
-_git_status ()
-{
-	local complete_opt
-	local untracked_state
-
-	case "$cur" in
-	--ignore-submodules=*)
-		__gitcomp "none untracked dirty all" "" "${cur##--ignore-submodules=}"
-		return
-		;;
-	--untracked-files=*)
-		__gitcomp "$__git_untracked_file_modes" "" "${cur##--untracked-files=}"
-		return
-		;;
-	--column=*)
-		__gitcomp "
-			always never auto column row plain dense nodense
-			" "" "${cur##--column=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin status
-		return
-		;;
-	esac
-
-	untracked_state="$(__git_get_option_value "-u" "--untracked-files=" \
-		"$__git_untracked_file_modes" "status.showUntrackedFiles")"
-
-	case "$untracked_state" in
-	no)
-		# --ignored option does not matter
-		complete_opt=
-		;;
-	all|normal|*)
-		complete_opt="--cached --directory --no-empty-directory --others"
-
-		if [ -n "$(__git_find_on_cmdline "--ignored")" ]; then
-			complete_opt="$complete_opt --ignored --exclude=*"
-		fi
-		;;
-	esac
-
-	__git_complete_index_file "$complete_opt"
-}
-
-_git_switch ()
-{
-	case "$cur" in
-	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
-		;;
-	--*)
-		__gitcomp_builtin switch
-		;;
-	*)
-		# check if --track, --no-track, or --no-guess was specified
-		# if so, disable DWIM mode
-		local track_opt="--track" only_local_ref=n
-		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
-		   [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess")" ]; then
-			track_opt=''
-		fi
-		# explicit --guess enables DWIM mode regardless of
-		# $GIT_COMPLETION_CHECKOUT_NO_GUESS
-		if [ -n "$(__git_find_on_cmdline "--guess")" ]; then
-			track_opt='--track'
-		fi
-		if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then
-			only_local_ref=y
-		else
-			# --guess --detach is invalid combination, no
-			# dwim will be done when --detach is specified
-			track_opt=
-		fi
-		if [ $only_local_ref = y -a -z "$track_opt" ]; then
-			__gitcomp_direct "$(__git_heads "" "$cur" " ")"
-		else
-			__git_complete_refs $track_opt
-		fi
-		;;
-	esac
-}
-
-__git_config_get_set_variables ()
-{
-	local prevword word config_file= c=$cword
-	while [ $c -gt 1 ]; do
-		word="${words[c]}"
-		case "$word" in
-		--system|--global|--local|--file=*)
-			config_file="$word"
-			break
-			;;
-		-f|--file)
-			config_file="$word $prevword"
-			break
-			;;
-		esac
-		prevword=$word
-		c=$((--c))
-	done
-
-	__git config $config_file --name-only --list
-}
-
-__git_config_vars=
-__git_compute_config_vars ()
-{
-	test -n "$__git_config_vars" ||
-	__git_config_vars="$(git help --config-for-completion | sort -u)"
-}
-
-# Completes possible values of various configuration variables.
-#
-# Usage: __git_complete_config_variable_value [<option>]...
-# --varname=<word>: The name of the configuration variable whose value is
-#                   to be completed.  Defaults to the previous word on the
-#                   command line.
-# --cur=<word>: The current value to be completed.  Defaults to the current
-#               word to be completed.
-__git_complete_config_variable_value ()
-{
-	local varname="$prev" cur_="$cur"
-
-	while test $# != 0; do
-		case "$1" in
-		--varname=*)	varname="${1##--varname=}" ;;
-		--cur=*)	cur_="${1##--cur=}" ;;
-		*)		return 1 ;;
-		esac
-		shift
-	done
-
-	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
-		varname="${varname,,}"
-	else
-		varname="$(echo "$varname" |tr A-Z a-z)"
-	fi
-
-	case "$varname" in
-	branch.*.remote|branch.*.pushremote)
-		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
-		return
-		;;
-	branch.*.merge)
-		__git_complete_refs --cur="$cur_"
-		return
-		;;
-	branch.*.rebase)
-		__gitcomp "false true merges preserve interactive" "" "$cur_"
-		return
-		;;
-	remote.pushdefault)
-		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
-		return
-		;;
-	remote.*.fetch)
-		local remote="${varname#remote.}"
-		remote="${remote%.fetch}"
-		if [ -z "$cur_" ]; then
-			__gitcomp_nl "refs/heads/" "" "" ""
-			return
-		fi
-		__gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
-		return
-		;;
-	remote.*.push)
-		local remote="${varname#remote.}"
-		remote="${remote%.push}"
-		__gitcomp_nl "$(__git for-each-ref \
-			--format='%(refname):%(refname)' refs/heads)" "" "$cur_"
-		return
-		;;
-	pull.twohead|pull.octopus)
-		__git_compute_merge_strategies
-		__gitcomp "$__git_merge_strategies" "" "$cur_"
-		return
-		;;
-	color.pager)
-		__gitcomp "false true" "" "$cur_"
-		return
-		;;
-	color.*.*)
-		__gitcomp "
-			normal black red green yellow blue magenta cyan white
-			bold dim ul blink reverse
-			" "" "$cur_"
-		return
-		;;
-	color.*)
-		__gitcomp "false true always never auto" "" "$cur_"
-		return
-		;;
-	diff.submodule)
-		__gitcomp "$__git_diff_submodule_formats" "" "$cur_"
-		return
-		;;
-	help.format)
-		__gitcomp "man info web html" "" "$cur_"
-		return
-		;;
-	log.date)
-		__gitcomp "$__git_log_date_formats" "" "$cur_"
-		return
-		;;
-	sendemail.aliasfiletype)
-		__gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
-		return
-		;;
-	sendemail.confirm)
-		__gitcomp "$__git_send_email_confirm_options" "" "$cur_"
-		return
-		;;
-	sendemail.suppresscc)
-		__gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
-		return
-		;;
-	sendemail.transferencoding)
-		__gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
-		return
-		;;
-	*.*)
-		return
-		;;
-	esac
-}
-
-# Completes configuration sections, subsections, variable names.
-#
-# Usage: __git_complete_config_variable_name [<option>]...
-# --cur=<word>: The current configuration section/variable name to be
-#               completed.  Defaults to the current word to be completed.
-# --sfx=<suffix>: A suffix to be appended to each fully completed
-#                 configuration variable name (but not to sections or
-#                 subsections) instead of the default space.
-__git_complete_config_variable_name ()
-{
-	local cur_="$cur" sfx
-
-	while test $# != 0; do
-		case "$1" in
-		--cur=*)	cur_="${1##--cur=}" ;;
-		--sfx=*)	sfx="${1##--sfx=}" ;;
-		*)		return 1 ;;
-		esac
-		shift
-	done
-
-	case "$cur_" in
-	branch.*.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_##*.}"
-		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	branch.*)
-		local pfx="${cur%.*}."
-		cur_="${cur#*.}"
-		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	guitool.*.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_##*.}"
-		__gitcomp "
-			argPrompt cmd confirm needsFile noConsole noRescan
-			prompt revPrompt revUnmerged title
-			" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	difftool.*.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	man.*.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	mergetool.*.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_##*.}"
-		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	pager.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_#*.}"
-		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	remote.*.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_##*.}"
-		__gitcomp "
-			url proxy fetch push mirror skipDefaultUpdate
-			receivepack uploadpack tagOpt pushurl
-			" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	remote.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_#*.}"
-		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	url.*.*)
-		local pfx="${cur_%.*}."
-		cur_="${cur_##*.}"
-		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
-		return
-		;;
-	*.*)
-		__git_compute_config_vars
-		__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
-		;;
-	*)
-		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" |
-				awk -F . '{
-					sections[$1] = 1
-				}
-				END {
-					for (s in sections)
-						print s "."
-				}
-				')" "" "$cur_"
-		;;
-	esac
-}
-
-# Completes '='-separated configuration sections/variable names and values
-# for 'git -c section.name=value'.
-#
-# Usage: __git_complete_config_variable_name_and_value [<option>]...
-# --cur=<word>: The current configuration section/variable name/value to be
-#               completed. Defaults to the current word to be completed.
-__git_complete_config_variable_name_and_value ()
-{
-	local cur_="$cur"
-
-	while test $# != 0; do
-		case "$1" in
-		--cur=*)	cur_="${1##--cur=}" ;;
-		*)		return 1 ;;
-		esac
-		shift
-	done
-
-	case "$cur_" in
-	*=*)
-		__git_complete_config_variable_value \
-			--varname="${cur_%%=*}" --cur="${cur_#*=}"
-		;;
-	*)
-		__git_complete_config_variable_name --cur="$cur_" --sfx='='
-		;;
-	esac
-}
-
-_git_config ()
-{
-	case "$prev" in
-	--get|--get-all|--unset|--unset-all)
-		__gitcomp_nl "$(__git_config_get_set_variables)"
-		return
-		;;
-	*.*)
-		__git_complete_config_variable_value
-		return
-		;;
-	esac
-	case "$cur" in
-	--*)
-		__gitcomp_builtin config
-		;;
-	*)
-		__git_complete_config_variable_name
-		;;
-	esac
-}
-
-_git_remote ()
-{
-	local subcommands="
-		add rename remove set-head set-branches
-		get-url set-url show prune update
-		"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
-		case "$cur" in
-		--*)
-			__gitcomp_builtin remote
-			;;
-		*)
-			__gitcomp "$subcommands"
-			;;
-		esac
-		return
-	fi
-
-	case "$subcommand,$cur" in
-	add,--*)
-		__gitcomp_builtin remote_add
-		;;
-	add,*)
-		;;
-	set-head,--*)
-		__gitcomp_builtin remote_set-head
-		;;
-	set-branches,--*)
-		__gitcomp_builtin remote_set-branches
-		;;
-	set-head,*|set-branches,*)
-		__git_complete_remote_or_refspec
-		;;
-	update,--*)
-		__gitcomp_builtin remote_update
-		;;
-	update,*)
-		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
-		;;
-	set-url,--*)
-		__gitcomp_builtin remote_set-url
-		;;
-	get-url,--*)
-		__gitcomp_builtin remote_get-url
-		;;
-	prune,--*)
-		__gitcomp_builtin remote_prune
-		;;
-	*)
-		__gitcomp_nl "$(__git_remotes)"
-		;;
-	esac
-}
-
-_git_replace ()
-{
-	case "$cur" in
-	--format=*)
-		__gitcomp "short medium long" "" "${cur##--format=}"
-		return
-		;;
-	--*)
-		__gitcomp_builtin replace
-		return
-		;;
-	esac
-	__git_complete_refs
-}
-
-_git_rerere ()
-{
-	local subcommands="clear forget diff remaining status gc"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if test -z "$subcommand"
-	then
-		__gitcomp "$subcommands"
-		return
-	fi
-}
-
-_git_reset ()
-{
-	__git_has_doubledash && return
-
-	case "$cur" in
-	--*)
-		__gitcomp_builtin reset
-		return
-		;;
-	esac
-	__git_complete_refs
-}
-
-_git_restore ()
-{
-	case "$cur" in
-	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
-		;;
-	--source=*)
-		__git_complete_refs --cur="${cur##--source=}"
-		;;
-	--*)
-		__gitcomp_builtin restore
-		;;
-	esac
-}
-
-__git_revert_inprogress_options=$__git_sequencer_inprogress_options
-
-_git_revert ()
-{
-	__git_find_repo_path
-	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "$__git_revert_inprogress_options"
-		return
-	fi
-	__git_complete_strategy && return
-	case "$cur" in
-	--*)
-		__gitcomp_builtin revert "" \
-			"$__git_revert_inprogress_options"
-		return
-		;;
-	esac
-	__git_complete_refs
-}
-
-_git_rm ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin rm
-		return
-		;;
-	esac
-
-	__git_complete_index_file "--cached"
-}
-
-_git_shortlog ()
-{
-	__git_has_doubledash && return
-
-	case "$cur" in
-	--*)
-		__gitcomp "
-			$__git_log_common_options
-			$__git_log_shortlog_options
-			--numbered --summary --email
-			"
-		return
-		;;
-	esac
-	__git_complete_revlist
-}
-
-_git_show ()
-{
-	__git_has_doubledash && return
-
-	case "$cur" in
-	--pretty=*|--format=*)
-		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
-			" "" "${cur#*=}"
-		return
-		;;
-	--diff-algorithm=*)
-		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
-		return
-		;;
-	--submodule=*)
-		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
-		return
-		;;
-	--*)
-		__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
-			--oneline --show-signature --patch
-			--expand-tabs --expand-tabs= --no-expand-tabs
-			$__git_diff_common_options
-			"
-		return
-		;;
-	esac
-	__git_complete_revlist_file
-}
-
-_git_show_branch ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp_builtin show-branch
-		return
-		;;
-	esac
-	__git_complete_revlist
-}
-
-_git_sparse_checkout ()
-{
-	local subcommands="list init set disable"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
-		__gitcomp "$subcommands"
-		return
-	fi
-
-	case "$subcommand,$cur" in
-	init,--*)
-		__gitcomp "--cone"
-		;;
-	set,--*)
-		__gitcomp "--stdin"
-		;;
-	*)
-		;;
-	esac
-}
-
-_git_stash ()
-{
-	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
-	local subcommands='push list show apply clear drop pop create branch'
-	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
-	if [ -n "$(__git_find_on_cmdline "-p")" ]; then
-		subcommand="push"
-	fi
-	if [ -z "$subcommand" ]; then
-		case "$cur" in
-		--*)
-			__gitcomp "$save_opts"
-			;;
-		sa*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "save"
-			fi
-			;;
-		*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "$subcommands"
-			fi
-			;;
-		esac
-	else
-		case "$subcommand,$cur" in
-		push,--*)
-			__gitcomp "$save_opts --message"
-			;;
-		save,--*)
-			__gitcomp "$save_opts"
-			;;
-		apply,--*|pop,--*)
-			__gitcomp "--index --quiet"
-			;;
-		drop,--*)
-			__gitcomp "--quiet"
-			;;
-		list,--*)
-			__gitcomp "--name-status --oneline --patch-with-stat"
-			;;
-		show,--*|branch,--*)
-			;;
-		branch,*)
-			if [ $cword -eq 3 ]; then
-				__git_complete_refs
-			else
-				__gitcomp_nl "$(__git stash list \
-						| sed -n -e 's/:.*//p')"
-			fi
-			;;
-		show,*|apply,*|drop,*|pop,*)
-			__gitcomp_nl "$(__git stash list \
-					| sed -n -e 's/:.*//p')"
-			;;
-		*)
-			;;
-		esac
-	fi
-}
-
-_git_submodule ()
-{
-	__git_has_doubledash && return
-
-	local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
-		case "$cur" in
-		--*)
-			__gitcomp "--quiet"
-			;;
-		*)
-			__gitcomp "$subcommands"
-			;;
-		esac
-		return
-	fi
-
-	case "$subcommand,$cur" in
-	add,--*)
-		__gitcomp "--branch --force --name --reference --depth"
-		;;
-	status,--*)
-		__gitcomp "--cached --recursive"
-		;;
-	deinit,--*)
-		__gitcomp "--force --all"
-		;;
-	update,--*)
-		__gitcomp "
-			--init --remote --no-fetch
-			--recommend-shallow --no-recommend-shallow
-			--force --rebase --merge --reference --depth --recursive --jobs
-		"
-		;;
-	set-branch,--*)
-		__gitcomp "--default --branch"
-		;;
-	summary,--*)
-		__gitcomp "--cached --files --summary-limit"
-		;;
-	foreach,--*|sync,--*)
-		__gitcomp "--recursive"
-		;;
-	*)
-		;;
-	esac
-}
-
-_git_svn ()
-{
-	local subcommands="
-		init fetch clone rebase dcommit log find-rev
-		set-tree commit-diff info create-ignore propget
-		proplist show-ignore show-externals branch tag blame
-		migrate mkdirs reset gc
-		"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
-		__gitcomp "$subcommands"
-	else
-		local remote_opts="--username= --config-dir= --no-auth-cache"
-		local fc_opts="
-			--follow-parent --authors-file= --repack=
-			--no-metadata --use-svm-props --use-svnsync-props
-			--log-window-size= --no-checkout --quiet
-			--repack-flags --use-log-author --localtime
-			--add-author-from
-			--recursive
-			--ignore-paths= --include-paths= $remote_opts
-			"
-		local init_opts="
-			--template= --shared= --trunk= --tags=
-			--branches= --stdlayout --minimize-url
-			--no-metadata --use-svm-props --use-svnsync-props
-			--rewrite-root= --prefix= $remote_opts
-			"
-		local cmt_opts="
-			--edit --rmdir --find-copies-harder --copy-similarity=
-			"
-
-		case "$subcommand,$cur" in
-		fetch,--*)
-			__gitcomp "--revision= --fetch-all $fc_opts"
-			;;
-		clone,--*)
-			__gitcomp "--revision= $fc_opts $init_opts"
-			;;
-		init,--*)
-			__gitcomp "$init_opts"
-			;;
-		dcommit,--*)
-			__gitcomp "
-				--merge --strategy= --verbose --dry-run
-				--fetch-all --no-rebase --commit-url
-				--revision --interactive $cmt_opts $fc_opts
-				"
-			;;
-		set-tree,--*)
-			__gitcomp "--stdin $cmt_opts $fc_opts"
-			;;
-		create-ignore,--*|propget,--*|proplist,--*|show-ignore,--*|\
-		show-externals,--*|mkdirs,--*)
-			__gitcomp "--revision="
-			;;
-		log,--*)
-			__gitcomp "
-				--limit= --revision= --verbose --incremental
-				--oneline --show-commit --non-recursive
-				--authors-file= --color
-				"
-			;;
-		rebase,--*)
-			__gitcomp "
-				--merge --verbose --strategy= --local
-				--fetch-all --dry-run $fc_opts
-				"
-			;;
-		commit-diff,--*)
-			__gitcomp "--message= --file= --revision= $cmt_opts"
-			;;
-		info,--*)
-			__gitcomp "--url"
-			;;
-		branch,--*)
-			__gitcomp "--dry-run --message --tag"
-			;;
-		tag,--*)
-			__gitcomp "--dry-run --message"
-			;;
-		blame,--*)
-			__gitcomp "--git-format"
-			;;
-		migrate,--*)
-			__gitcomp "
-				--config-dir= --ignore-paths= --minimize
-				--no-auth-cache --username=
-				"
-			;;
-		reset,--*)
-			__gitcomp "--revision= --parent"
-			;;
-		*)
-			;;
-		esac
-	fi
-}
-
-_git_tag ()
-{
-	local i c=1 f=0
-	while [ $c -lt $cword ]; do
-		i="${words[c]}"
-		case "$i" in
-		-d|--delete|-v|--verify)
-			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
-			return
-			;;
-		-f)
-			f=1
-			;;
-		esac
-		((c++))
-	done
-
-	case "$prev" in
-	-m|-F)
-		;;
-	-*|tag)
-		if [ $f = 1 ]; then
-			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
-		fi
-		;;
-	*)
-		__git_complete_refs
-		;;
-	esac
-
-	case "$cur" in
-	--*)
-		__gitcomp_builtin tag
-		;;
-	esac
-}
-
-_git_whatchanged ()
-{
-	_git_log
-}
-
-__git_complete_worktree_paths ()
-{
-	local IFS=$'\n'
-	__gitcomp_nl "$(git worktree list --porcelain |
-		# Skip the first entry: it's the path of the main worktree,
-		# which can't be moved, removed, locked, etc.
-		sed -n -e '2,$ s/^worktree //p')"
-}
-
-_git_worktree ()
-{
-	local subcommands="add list lock move prune remove unlock"
-	local subcommand subcommand_idx
-
-	subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")"
-	subcommand_idx="${subcommand% *}"
-	subcommand="${subcommand#* }"
-
-	case "$subcommand,$cur" in
-	,*)
-		__gitcomp "$subcommands"
-		;;
-	*,--*)
-		__gitcomp_builtin worktree_$subcommand
-		;;
-	add,*)	# usage: git worktree add [<options>] <path> [<commit-ish>]
-		# Here we are not completing an --option, it's either the
-		# path or a ref.
-		case "$prev" in
-		-b|-B)	# Complete refs for branch to be created/reseted.
-			__git_complete_refs
-			;;
-		-*)	# The previous word is an -o|--option without an
-			# unstuck argument: have to complete the path for
-			# the new worktree, so don't list anything, but let
-			# Bash fall back to filename completion.
-			;;
-		*)	# The previous word is not an --option, so it must
-			# be either the 'add' subcommand, the unstuck
-			# argument of an option (e.g. branch for -b|-B), or
-			# the path for the new worktree.
-			if [ $cword -eq $((subcommand_idx+1)) ]; then
-				# Right after the 'add' subcommand: have to
-				# complete the path, so fall back to Bash
-				# filename completion.
-				:
-			else
-				case "${words[cword-2]}" in
-				-b|-B)	# After '-b <branch>': have to
-					# complete the path, so fall back
-					# to Bash filename completion.
-					;;
-				*)	# After the path: have to complete
-					# the ref to be checked out.
-					__git_complete_refs
-					;;
-				esac
-			fi
-			;;
-		esac
-		;;
-	lock,*|remove,*|unlock,*)
-		__git_complete_worktree_paths
-		;;
-	move,*)
-		if [ $cword -eq $((subcommand_idx+1)) ]; then
-			# The first parameter must be an existing working
-			# tree to be moved.
-			__git_complete_worktree_paths
-		else
-			# The second parameter is the destination: it could
-			# be any path, so don't list anything, but let Bash
-			# fall back to filename completion.
-			:
-		fi
-		;;
-	esac
-}
-
-__git_complete_common () {
-	local command="$1"
-
-	case "$cur" in
-	--*)
-		__gitcomp_builtin "$command"
-		;;
-	esac
-}
-
-__git_cmds_with_parseopt_helper=
-__git_support_parseopt_helper () {
-	test -n "$__git_cmds_with_parseopt_helper" ||
-		__git_cmds_with_parseopt_helper="$(__git --list-cmds=parseopt)"
-
-	case " $__git_cmds_with_parseopt_helper " in
-	*" $1 "*)
-		return 0
-		;;
-	*)
-		return 1
-		;;
-	esac
-}
-
-__git_complete_command () {
-	local command="$1"
-	local completion_func="_git_${command//-/_}"
-	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
-		declare -f _completion_loader >/dev/null 2>/dev/null
-	then
-		_completion_loader "git-$command"
-	fi
-	if declare -f $completion_func >/dev/null 2>/dev/null
-	then
-		$completion_func
-		return 0
-	elif __git_support_parseopt_helper "$command"
-	then
-		__git_complete_common "$command"
-		return 0
-	else
-		return 1
-	fi
-}
-
-__git_main ()
-{
-	local i c=1 command __git_dir __git_repo_path
-	local __git_C_args C_args_count=0
-
-	while [ $c -lt $cword ]; do
-		i="${words[c]}"
-		case "$i" in
-		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
-		--git-dir)   ((c++)) ; __git_dir="${words[c]}" ;;
-		--bare)      __git_dir="." ;;
-		--help) command="help"; break ;;
-		-c|--work-tree|--namespace) ((c++)) ;;
-		-C)	__git_C_args[C_args_count++]=-C
-			((c++))
-			__git_C_args[C_args_count++]="${words[c]}"
-			;;
-		-*) ;;
-		*) command="$i"; break ;;
-		esac
-		((c++))
-	done
-
-	if [ -z "$command" ]; then
-		case "$prev" in
-		--git-dir|-C|--work-tree)
-			# these need a path argument, let's fall back to
-			# Bash filename completion
-			return
-			;;
-		-c)
-			__git_complete_config_variable_name_and_value
-			return
-			;;
-		--namespace)
-			# we don't support completing these options' arguments
-			return
-			;;
-		esac
-		case "$cur" in
-		--*)   __gitcomp "
-			--paginate
-			--no-pager
-			--git-dir=
-			--bare
-			--version
-			--exec-path
-			--exec-path=
-			--html-path
-			--man-path
-			--info-path
-			--work-tree=
-			--namespace=
-			--no-replace-objects
-			--help
-			"
-			;;
-		*)
-			if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
-			then
-				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
-			else
-				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
-			fi
-			;;
-		esac
-		return
-	fi
-
-	__git_complete_command "$command" && return
-
-	local expansion=$(__git_aliased_command "$command")
-	if [ -n "$expansion" ]; then
-		words[1]=$expansion
-		__git_complete_command "$expansion"
-	fi
-}
-
-__gitk_main ()
-{
-	__git_has_doubledash && return
-
-	local __git_repo_path
-	__git_find_repo_path
-
-	local merge=""
-	if [ -f "$__git_repo_path/MERGE_HEAD" ]; then
-		merge="--merge"
-	fi
-	case "$cur" in
-	--*)
-		__gitcomp "
-			$__git_log_common_options
-			$__git_log_gitk_options
-			$merge
-			"
-		return
-		;;
-	esac
-	__git_complete_revlist
-}
-
-if [[ -n ${ZSH_VERSION-} ]] &&
-   # Don't define these functions when sourced from 'git-completion.zsh',
-   # it has its own implementations.
-   [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
-	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
-
-	autoload -U +X compinit && compinit
-
-	__gitcomp ()
-	{
-		emulate -L zsh
-
-		local cur_="${3-$cur}"
-
-		case "$cur_" in
-		--*=)
-			;;
-		*)
-			local c IFS=$' \t\n'
-			local -a array
-			for c in ${=1}; do
-				c="$c${4-}"
-				case $c in
-				--*=*|*.) ;;
-				*) c="$c " ;;
-				esac
-				array[${#array[@]}+1]="$c"
-			done
-			compset -P '*[=:]'
-			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
-			;;
-		esac
-	}
-
-	__gitcomp_direct ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -- ${=1} && _ret=0
-	}
-
-	__gitcomp_nl ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
-	}
-
-	__gitcomp_file_direct ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -f -- ${=1} && _ret=0
-	}
-
-	__gitcomp_file ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -p "${2-}" -f -- ${=1} && _ret=0
-	}
-
-	_git ()
-	{
-		local _ret=1 cur cword prev
-		cur=${words[CURRENT]}
-		prev=${words[CURRENT-1]}
-		let cword=CURRENT-1
-		emulate ksh -c __${service}_main
-		let _ret && _default && _ret=0
-		return _ret
-	}
-
-	compdef _git git gitk
-	return
-fi
-
-__git_func_wrap ()
-{
-	local cur words cword prev
-	_get_comp_words_by_ref -n =: cur words cword prev
-	$1
-}
-
-# Setup completion for certain functions defined above by setting common
-# variables and workarounds.
-# This is NOT a public function; use at your own risk.
-__git_complete ()
-{
-	local wrapper="__git_wrap${2}"
-	eval "$wrapper () { __git_func_wrap $2 ; }"
-	complete -o bashdefault -o default -o nospace -F $wrapper $1 2>/dev/null \
-		|| complete -o default -o nospace -F $wrapper $1
-}
-
-# wrapper for backwards compatibility
-_git ()
-{
-	__git_wrap__git_main
-}
-
-# wrapper for backwards compatibility
-_gitk ()
-{
-	__git_wrap__gitk_main
-}
-
-__git_complete git __git_main
-__git_complete gitk __gitk_main
-
-# The following are necessary only for Cygwin, and only are needed
-# when the user has tab-completed the executable name and consequently
-# included the '.exe' suffix.
-#
-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-__git_complete git.exe __git_main
+_git_bash_completion_found=false
+_git_bash_completion_paths=(
+  # MacOS non-system locations
+  '/Library/Developer/CommandLineTools/usr/share/git-core/git-completion.bash'
+  '/Applications/Xcode.app/Contents/Developer/usr/share/git-core/git-completion.bash'
+)
+
+# Load the first completion file found
+for _comp_path in "${_git_bash_completion_paths[@]}" ; do
+  if [ -r "$_comp_path" ] ; then
+    _git_bash_completion_found=true
+    source "$_comp_path"
+    break
+  fi
+done
+
+# Cleanup
+if ! _git_bash_completion_found ; then
+  _log_warning "no completion files found - please try enabling the 'system' completion instead."
 fi
+unset _git_bash_completion_paths
+unset _git_bash_completion_found

From 41084ee67807fef423cad2f2fab25ccfce5a3d0e Mon Sep 17 00:00:00 2001
From: Kan Li <likan999@users.noreply.github.com>
Date: Sat, 8 Aug 2020 22:09:43 -0700
Subject: [PATCH 283/388] Fix error "bash: _git_bash_completion_found: command
 not found..."

---
 completion/available/git.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash
index 8c5c9ea3..9c077451 100644
--- a/completion/available/git.completion.bash
+++ b/completion/available/git.completion.bash
@@ -32,7 +32,7 @@ for _comp_path in "${_git_bash_completion_paths[@]}" ; do
 done
 
 # Cleanup
-if ! _git_bash_completion_found ; then
+if [[ "${_git_bash_completion_found}" == false ]]; then
   _log_warning "no completion files found - please try enabling the 'system' completion instead."
 fi
 unset _git_bash_completion_paths

From 230bafd0d1e4a48d92e779f16a2cc756e4b505d5 Mon Sep 17 00:00:00 2001
From: Nils Winkler <nils@nilswinkler.com>
Date: Mon, 10 Aug 2020 09:06:36 +0200
Subject: [PATCH 284/388] Fixed OS comparison for macOS

This was always failing on macOS instead of working there...

See #1635 for the original commit that introduced this issue.
---
 completion/available/git.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash
index 9c077451..0020ad1b 100644
--- a/completion/available/git.completion.bash
+++ b/completion/available/git.completion.bash
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Only operate on MacOS since there are no linux paths
-if [[ "$(uname -s)" == 'Darwin' ]] ; then
+if [[ "$(uname -s)" != 'Darwin' ]] ; then
   _log_warning "unsupported operating system - only 'Darwin' is supported"
   return 0
 fi

From d8a0e8444d94cef34ac3be1f7f4519d73fbf6769 Mon Sep 17 00:00:00 2001
From: Guilherme Paula <guilhermepaula@gmail.com>
Date: Tue, 1 Sep 2020 13:52:50 -0300
Subject: [PATCH 285/388] [robbyrussell theme] Cleaning up bold markup after
 theme

---
 themes/robbyrussell/robbyrussell.theme.bash | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/themes/robbyrussell/robbyrussell.theme.bash b/themes/robbyrussell/robbyrussell.theme.bash
index 5745ab1e..956347dd 100644
--- a/themes/robbyrussell/robbyrussell.theme.bash
+++ b/themes/robbyrussell/robbyrussell.theme.bash
@@ -13,14 +13,13 @@ GIT_THEME_PROMPT_SUFFIX="${bold_blue})"
 RVM_THEME_PROMPT_PREFIX="|"
 RVM_THEME_PROMPT_SUFFIX="|"
 
-function git_prompt_info {
+function git_prompt_info() {
   git_prompt_vars
   echo -e "$SCM_PREFIX${bold_red}$SCM_BRANCH$SCM_STATE$SCM_SUFFIX"
 }
 
-
 function prompt_command() {
-    PS1="${bold_green}➜  ${bold_cyan}\W${reset_color}$(scm_prompt_info)${reset_color} "
+  PS1="${bold_green}➜  ${bold_cyan}\W${reset_color}$(scm_prompt_info)${normal} "
 }
 
-PROMPT_COMMAND=prompt_command;
+PROMPT_COMMAND=prompt_command

From 91b6561e93a35fa4aefe19c408073d599676c917 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Sat, 5 Sep 2020 22:52:19 +0300
Subject: [PATCH 286/388] gitstatus: Add informative warning in case dir is not
 found

---
 plugins/available/gitstatus.plugin.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/available/gitstatus.plugin.bash b/plugins/available/gitstatus.plugin.bash
index 98df693e..9df65a82 100644
--- a/plugins/available/gitstatus.plugin.bash
+++ b/plugins/available/gitstatus.plugin.bash
@@ -21,4 +21,6 @@ if [[ -d ${SCM_GIT_GITSTATUS_DIR} ]]; then
   # Start the actual gitstatus binary
   gitstatus_stop && gitstatus_start -s -1 -u -1 -c -1 -d -1
   export SCM_GIT_USE_GITSTATUS=true
+else
+	_log_warning "Could not find gitstatus directory in ${SCM_GIT_GITSTATUS_DIR}. Please specify directory location using SCM_GIT_GITSTATUS_DIR."
 fi

From ba02955340e84bff4f6d90883eafdcfab341c9e2 Mon Sep 17 00:00:00 2001
From: Oliver Ruben Albertini <ora@fb.com>
Date: Sat, 12 Sep 2020 09:54:47 -0700
Subject: [PATCH 287/388] hg SCM_CHANGE: prevent hexdump squeezing

hexdump by default will replace any repeated groups with an asterisk and
a newline, which breaks prompts. This can be disabled with the `-v`
flag. For example:

```
printf 'aac' | hexdump -e '1/1 "%02x"'
61*
63
printf 'abc' | hexdump -e '1/1 "%02x"'
616263
printf 'aac' | hexdump -ve '1/1 "%02x"'
616163
```
---
 themes/base.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 61671b51..58246720 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -344,7 +344,7 @@ function hg_prompt_vars {
 
     if [ -f "$HG_ROOT/dirstate" ]; then
         # Mercurial holds various information about the working directory in .hg/dirstate file. More on http://mercurial.selenic.com/wiki/DirState
-        SCM_CHANGE=$(hexdump -n 10 -e '1/1 "%02x"' "$HG_ROOT/dirstate" | cut -c-12)
+        SCM_CHANGE=$(hexdump -vn 10 -e '1/1 "%02x"' "$HG_ROOT/dirstate" | cut -c-12)
     else
         SCM_CHANGE=$(hg summary 2> /dev/null | grep parent: | awk '{print $2}')
     fi

From f40bfa80f199cfe7978eb031be04d84dd26b6144 Mon Sep 17 00:00:00 2001
From: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
Date: Sun, 12 Jul 2020 15:09:45 -0500
Subject: [PATCH 288/388] system completion nitpicks

- General cleanup of system completion
- Use homebrew's completion loading script instead
- Deprecate completions covered by system
- Adjust load priority of brew to happen after system
---
 completion/available/brew.completion.bash    | 38 +++++++++++++-------
 completion/available/crystal.completion.bash | 12 +------
 completion/available/system.completion.bash  | 31 ++++++++--------
 test/lib/helpers.bats                        |  4 +--
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/completion/available/brew.completion.bash b/completion/available/brew.completion.bash
index 9d010f05..4bdaf53d 100644
--- a/completion/available/brew.completion.bash
+++ b/completion/available/brew.completion.bash
@@ -1,13 +1,27 @@
-if which brew >/dev/null 2>&1; then
-  BREW_PREFIX=$(brew --prefix)
-  if [ -f "$BREW_PREFIX"/etc/bash_completion.d/brew ]; then
-    . "$BREW_PREFIX"/etc/bash_completion.d/brew
-  elif [ -f "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]; then
-    . "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
-  elif [ -f "$BREW_PREFIX"/completions/bash/brew ]; then
-    # For the git-clone based installation, see here for more info:
-    # https://github.com/Bash-it/bash-it/issues/1458
-    # https://docs.brew.sh/Shell-Completion   
-    . "$BREW_PREFIX"/completions/bash/brew
-  fi
+#!/usr/bin/env bash
+
+# Load late to make sure `system` completion loads first
+# BASH_IT_LOAD_PRIORITY: 375
+
+if [[ "$(uname -s)" != 'Darwin' ]] ; then
+  _log_warning "unsupported operating system - only 'Darwin' is supported"
+  return 0
+fi
+
+# Make sure brew is installed
+_command_exists brew || return 0
+
+BREW_PREFIX=${BREW_PREFIX:-$(brew --prefix)}
+
+if [[ -r "$BREW_PREFIX"/etc/bash_completion.d/brew ]] ; then
+  source "$BREW_PREFIX"/etc/bash_completion.d/brew
+
+elif [[ -r "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh ]] ; then
+  source "$BREW_PREFIX"/Library/Contributions/brew_bash_completion.sh
+
+elif [[ -f "$BREW_PREFIX"/completions/bash/brew ]] ; then
+  # For the git-clone based installation, see here for more info:
+  # https://github.com/Bash-it/bash-it/issues/1458
+  # https://docs.brew.sh/Shell-Completion
+  source "$BREW_PREFIX"/completions/bash/brew
 fi
diff --git a/completion/available/crystal.completion.bash b/completion/available/crystal.completion.bash
index cbc891d7..7644ffd4 100644
--- a/completion/available/crystal.completion.bash
+++ b/completion/available/crystal.completion.bash
@@ -1,11 +1 @@
-if which crystal >/dev/null 2>&1; then
-
-  if which brew >/dev/null 2>&1; then
-    BREW_PREFIX=$(brew --prefix)
-
-    if [ -f "$BREW_PREFIX"/etc/bash_completion.d/crystal ]; then
-      . "$BREW_PREFIX"/etc/bash_completion.d/crystal
-    fi
-  fi
-
-fi
+_log_warning 'Bash completion for "crystal" is now covered by "system". This completion can be disabled.'
diff --git a/completion/available/system.completion.bash b/completion/available/system.completion.bash
index b9f23495..8c4f71dc 100644
--- a/completion/available/system.completion.bash
+++ b/completion/available/system.completion.bash
@@ -1,28 +1,25 @@
 #!/usr/bin/env bash
 
 # Loads the system's Bash completion modules.
-# If Homebrew is installed (OS X), its Bash completion modules are loaded.
+# If Homebrew is installed (OS X), it's Bash completion modules are loaded.
 
-if [ -f /etc/bash_completion ]; then
-  . /etc/bash_completion
-fi
+if [[ -r /etc/bash_completion ]] ; then
+  # shellcheck disable=SC1091
+  source /etc/bash_completion
 
 # Some distribution makes use of a profile.d script to import completion.
-if [ -f /etc/profile.d/bash_completion.sh ]; then
-  . /etc/profile.d/bash_completion.sh
+elif [[ -r /etc/profile.d/bash_completion.sh ]] ; then
+  # shellcheck disable=SC1091
+  source /etc/profile.d/bash_completion.sh
+
 fi
 
+if [[ "$(uname -s)" == 'Darwin' ]] && _command_exists brew ; then
+  BREW_PREFIX=${BREW_PREFIX:-$(brew --prefix)}
 
-if [ $(uname) = "Darwin" ] && command -v brew &>/dev/null ; then
-  BREW_PREFIX=$(brew --prefix)
-
-  if [ -f "$BREW_PREFIX"/etc/bash_completion ]; then
-    . "$BREW_PREFIX"/etc/bash_completion
-  fi
-
- # homebrew/versions/bash-completion2 (required for projects.completion.bash) is installed to this path
-  if [ "${BASH_VERSINFO}" -ge 4 ] && [ -f "$BREW_PREFIX"/share/bash-completion/bash_completion ]; then
-    export BASH_COMPLETION_COMPAT_DIR="$BREW_PREFIX"/etc/bash_completion.d
-    . "$BREW_PREFIX"/share/bash-completion/bash_completion
+  # homebrew/versions/bash-completion2 (required for projects.completion.bash) is installed to this path
+  if [[ -r "$BREW_PREFIX"/etc/profile.d/bash_completion.sh ]] ; then
+    # shellcheck disable=SC1090
+    source "$BREW_PREFIX"/etc/profile.d/bash_completion.sh
   fi
 fi
diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index e452c38e..d4557300 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -128,8 +128,8 @@ function local_setup {
 
 @test "helpers: enable the brew completion" {
   run _enable-completion "brew"
-  assert_line -n 0 'brew enabled with priority 350.'
-  assert_link_exist "$BASH_IT/enabled/350---brew.completion.bash"
+  assert_line -n 0 'brew enabled with priority 375.'
+  assert_link_exist "$BASH_IT/enabled/375---brew.completion.bash"
 }
 
 @test "helpers: enable the node plugin" {

From 185257e9715d3db339e3e616d9ca0ed09a708565 Mon Sep 17 00:00:00 2001
From: 8F3E <39588555+8F3E@users.noreply.github.com>
Date: Tue, 22 Sep 2020 11:31:05 +0100
Subject: [PATCH 289/388] Detect python venv and show in prompt

---
 themes/barbuk/barbuk.theme.bash | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 5c5fdf1d..0a15d1e8 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -88,7 +88,14 @@ function _prompt {
         ssh_info="${bold_blue}\u${bold_orange}@${cyan}$host ${bold_orange}in"
     fi
 
-    PS1="\\n${ssh_info} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
+    # Detect python venv
+    if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+        python_venv="${CONDA_DEFAULT_ENV}"
+    elif [[ -n "${VIRTUAL_ENV}" ]]; then
+        python_venv=$(basename "${VIRTUAL_ENV}")
+    fi
+
+    PS1="\\n${ssh_info} ${python_venv} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
 
     [[ ${#PS1} -gt $((COLUMNS*3)) ]] && wrap_char="\\n"
     PS1="${PS1}${wrap_char}❯${normal} "

From 43dfe23d102eda5e862615e57f6f81fa5ebdcdf2 Mon Sep 17 00:00:00 2001
From: 8F3E <39588555+8F3E@users.noreply.github.com>
Date: Wed, 23 Sep 2020 11:32:18 +0100
Subject: [PATCH 290/388] Declare python_venv as a local variable

---
 themes/barbuk/barbuk.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 0a15d1e8..75790337 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -66,7 +66,7 @@ function _exit-code {
 }
 
 function _prompt {
-    local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' host
+    local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' python_venv='' host
 
     _exit-code exit_code
     _git-uptream-remote-logo

From 95b60098cd5802970eff9aef321ebfb2d047bbc8 Mon Sep 17 00:00:00 2001
From: Ahmad Assaf <ahmad.a.assaf@gmail.com>
Date: Thu, 24 Sep 2020 05:20:04 -0700
Subject: [PATCH 291/388] Update helpers.bats

Fix the `assert_success` by adding the required `run`
---
 test/lib/helpers.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index d4557300..70481b32 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -20,7 +20,7 @@ function local_setup {
 # TODO Create global __get_enabled_name function
 
 @test "helpers: _command_exists function exists" {
-  type -a _command_exists &> /dev/null
+  run type -a _command_exists &> /dev/null
   assert_success
 }
 

From 5e101fce34507830baf3be38c363dae355450e67 Mon Sep 17 00:00:00 2001
From: phreakocious <phreakocious@users.noreply.github.com>
Date: Wed, 30 Sep 2020 22:09:42 -0700
Subject: [PATCH 292/388] fix  __color_rgb function to properly compare r,g,b
 as variables and not lettersg

---
 themes/colors.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/colors.theme.bash b/themes/colors.theme.bash
index 53f357e2..ab4d8197 100644
--- a/themes/colors.theme.bash
+++ b/themes/colors.theme.bash
@@ -109,7 +109,7 @@ function __color_white   {
 
 function __color_rgb {
   r=$1 && g=$2 && b=$3
-  [[ r == g && g == b ]] && echo $(( $r / 11 + 232 )) && return # gray range above 232
+  [[ $r == g && $g == $b ]] && echo $(( $r / 11 + 232 )) && return # gray range above 232
   echo "8;5;$(( ($r * 36  + $b * 6 + $g) / 51 + 16 ))"
 }
 

From ee7075b5f1ad3d2db12b20318540c834cc845c77 Mon Sep 17 00:00:00 2001
From: phreakocious <phreakocious@users.noreply.github.com>
Date: Thu, 1 Oct 2020 08:07:18 -0700
Subject: [PATCH 293/388] add that pesky dollar sign

---
 themes/colors.theme.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/colors.theme.bash b/themes/colors.theme.bash
index ab4d8197..fbb1dc5c 100644
--- a/themes/colors.theme.bash
+++ b/themes/colors.theme.bash
@@ -109,7 +109,7 @@ function __color_white   {
 
 function __color_rgb {
   r=$1 && g=$2 && b=$3
-  [[ $r == g && $g == $b ]] && echo $(( $r / 11 + 232 )) && return # gray range above 232
+  [[ $r == $g && $g == $b ]] && echo $(( $r / 11 + 232 )) && return # gray range above 232
   echo "8;5;$(( ($r * 36  + $b * 6 + $g) / 51 + 16 ))"
 }
 

From f3cb4e512220262a8da5ec7d469d5f3e9fe9258f Mon Sep 17 00:00:00 2001
From: Zhengnan Zhao <zzhao212@gmail.com>
Date: Thu, 1 Oct 2020 23:40:59 -0400
Subject: [PATCH 294/388] Make bobby and bobby-python themes more readable

---
 themes/bobby-python/bobby-python.theme.bash | 9 +++++++--
 themes/bobby/bobby.theme.bash               | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/themes/bobby-python/bobby-python.theme.bash b/themes/bobby-python/bobby-python.theme.bash
index e2e5a97f..7aaea4e8 100644
--- a/themes/bobby-python/bobby-python.theme.bash
+++ b/themes/bobby-python/bobby-python.theme.bash
@@ -12,8 +12,13 @@ GIT_THEME_PROMPT_SUFFIX="${green}|"
 CONDAENV_THEME_PROMPT_SUFFIX="|"
 
 function prompt_command() {
-    #PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(ruby_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} "
-    PS1="\n${yellow}$(python_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
+    PS1="\n${yellow}$(python_version_prompt) "  # Name of virtual env followed by python version
+    PS1+="${purple}\h "
+    PS1+="${reset_color}in "
+    PS1+="${green}\w\n"
+    PS1+="${bold_cyan}$(scm_char)"
+    PS1+="${green}$(scm_prompt_info) "
+    PS1+="${green}→${reset_color} "
 }
 
 safe_append_prompt_command prompt_command
diff --git a/themes/bobby/bobby.theme.bash b/themes/bobby/bobby.theme.bash
index 0e70f8a6..6470354a 100644
--- a/themes/bobby/bobby.theme.bash
+++ b/themes/bobby/bobby.theme.bash
@@ -22,8 +22,13 @@ __bobby_clock() {
 }
 
 function prompt_command() {
-    #PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(ruby_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} "
-    PS1="\n$(battery_char) $(__bobby_clock)${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_prompt_char_info) ${green}→${reset_color} "
+    PS1="\n$(battery_char) $(__bobby_clock)"
+    PS1+="${yellow}$(ruby_version_prompt) "
+    PS1+="${purple}\h "
+    PS1+="${reset_color}in "
+    PS1+="${green}\w\n"
+    PS1+="${bold_cyan}$(scm_prompt_char_info) "
+    PS1+="${green}→${reset_color} "
 }
 
 THEME_SHOW_CLOCK_CHAR=${THEME_SHOW_CLOCK_CHAR:-"true"}

From 11819278b49c464848ccff9bd446bc1c562ae295 Mon Sep 17 00:00:00 2001
From: Travis Swicegood <travis@domain51.com>
Date: Mon, 27 Apr 2020 20:02:01 -0500
Subject: [PATCH 295/388] Add GitHub CLI completion

---
 completion/available/github-cli.completion.bash | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 completion/available/github-cli.completion.bash

diff --git a/completion/available/github-cli.completion.bash b/completion/available/github-cli.completion.bash
new file mode 100644
index 00000000..761824d9
--- /dev/null
+++ b/completion/available/github-cli.completion.bash
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+cite "about-completion"
+about-completion "GitHub CLI completion"
+
+if command -v which gh >/dev/null 2>&1; then
+  if command -v which brew >/dev/null 2>&1; then
+    BREW_PREFIX=$(brew --prefix)
+
+    if [ -f "$BREW_PREFIX"/etc/bash_completion.d/gh.sh ]; then
+      . "$BREW_PREFIX"/etc/bash_completion.d/gh.sh
+    fi
+
+  else
+    eval "$(gh completion --shell=bash)"
+  fi
+fi

From ac3957393e972df54bfed3132a038d79078c9efb Mon Sep 17 00:00:00 2001
From: Travis Swicegood <travis@domain51.com>
Date: Mon, 27 Apr 2020 20:11:59 -0500
Subject: [PATCH 296/388] Update tests so github-cli is expected

---
 test/lib/search.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lib/search.bats b/test/lib/search.bats
index 04624043..c7b39e77 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -46,7 +46,7 @@ function local_teardown {
     echo $plugin
     assert_line -n 1 -p $plugin
   done
-  assert_line -n 2 '  completions:  git   git_flow   git_flow_avh  '
+  assert_line -n 2 '  completions:  git   git_flow   git_flow_avh   github-cli  '
 }
 
 @test "search: ruby gem bundle rake rails" {

From 582ea5c2604fc535a37916d4182b0be739625a28 Mon Sep 17 00:00:00 2001
From: Travis Swicegood <travis@domain51.com>
Date: Tue, 28 Apr 2020 17:14:15 -0500
Subject: [PATCH 297/388] Update based on @nwinkler's feedback

---
 completion/available/github-cli.completion.bash | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/completion/available/github-cli.completion.bash b/completion/available/github-cli.completion.bash
index 761824d9..b3d1c1db 100644
--- a/completion/available/github-cli.completion.bash
+++ b/completion/available/github-cli.completion.bash
@@ -2,15 +2,9 @@
 cite "about-completion"
 about-completion "GitHub CLI completion"
 
-if command -v which gh >/dev/null 2>&1; then
-  if command -v which brew >/dev/null 2>&1; then
-    BREW_PREFIX=$(brew --prefix)
-
-    if [ -f "$BREW_PREFIX"/etc/bash_completion.d/gh.sh ]; then
-      . "$BREW_PREFIX"/etc/bash_completion.d/gh.sh
-    fi
-
-  else
-    eval "$(gh completion --shell=bash)"
+if _command_exists gh; then
+  if _command_exists brew; then
+    echo "You don't need github-cli completion enabled if you have system completion enabled"
   fi
+  eval "$(gh completion --shell=bash)"
 fi

From e010512dee423d12ce490bd59db629d89c143cb4 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 10 Oct 2020 02:41:45 +0300
Subject: [PATCH 298/388] completion: github: Use _log_warning instead of
 simple echo

---
 completion/available/github-cli.completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completion/available/github-cli.completion.bash b/completion/available/github-cli.completion.bash
index b3d1c1db..2fb3d370 100644
--- a/completion/available/github-cli.completion.bash
+++ b/completion/available/github-cli.completion.bash
@@ -4,7 +4,7 @@ about-completion "GitHub CLI completion"
 
 if _command_exists gh; then
   if _command_exists brew; then
-    echo "You don't need github-cli completion enabled if you have system completion enabled"
+    _log_warning "You don't need github-cli completion enabled if you have system completion enabled"
   fi
   eval "$(gh completion --shell=bash)"
 fi

From 92a1310bc2d1d97ccf79d239b7861681a9b58065 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 10 Oct 2020 02:54:58 +0300
Subject: [PATCH 299/388] Remove deprecated and unused gh completion/plugin

---
 completion/available/gh.completion.bash | 366 ------------------------
 plugins/available/gh.plugin.bash        |   4 -
 2 files changed, 370 deletions(-)
 delete mode 100644 completion/available/gh.completion.bash
 delete mode 100644 plugins/available/gh.plugin.bash

diff --git a/completion/available/gh.completion.bash b/completion/available/gh.completion.bash
deleted file mode 100644
index c2949382..00000000
--- a/completion/available/gh.completion.bash
+++ /dev/null
@@ -1,366 +0,0 @@
-# hub tab-completion script for bash.
-# This script complements the completion script that ships with git.
-
-# Check that git tab completion is available
-if declare -F _git > /dev/null; then
-  # Duplicate and rename the 'list_all_commands' function
-  eval "$(declare -f __git_list_all_commands | \
-        sed 's/__git_list_all_commands/__git_list_all_commands_without_hub/')"
-
-  # Wrap the 'list_all_commands' function with extra hub commands
-  __git_list_all_commands() {
-    cat <<-EOF
-alias
-pull-request
-fork
-create
-browse
-compare
-ci-status
-release
-issue
-update
-EOF
-    __git_list_all_commands_without_hub
-  }
-
-  # Ensure cached commands are cleared
-  __git_all_commands=""
-
-  ##########################
-  # hub command completions
-  ##########################
-
-  # hub alias [-s] [SHELL]
-  _git_alias() {
-    local i c=2 s=-s sh shells="bash zsh sh ksh csh fish"
-    while [ $c -lt $cword ]; do
-      i="${words[c]}"
-      case "$i" in
-        -s)
-          unset s
-          ;;
-        *)
-          for sh in $shells; do
-            if [ "$sh" = "$i" ]; then
-              unset shells
-              break
-            fi
-          done
-          ;;
-      esac
-      ((c++))
-    done
-    __gitcomp "$s $shells"
-  }
-
-  # hub browse [-u] [--|[USER/]REPOSITORY] [SUBPAGE]
-  _git_browse() {
-    local i c=2 u=-u repo subpage
-    local subpages_="commits issues tree wiki pulls branches stargazers
-      contributors network network/ graphs graphs/"
-    local subpages_network="members"
-    local subpages_graphs="commit-activity code-frequency punch-card"
-    while [ $c -lt $cword ]; do
-      i="${words[c]}"
-      case "$i" in
-        -u)
-          unset u
-          ;;
-        *)
-          if [ -z "$repo" ]; then
-            repo=$i
-          else
-            subpage=$i
-          fi
-          ;;
-      esac
-      ((c++))
-    done
-    if [ -z "$repo" ]; then
-      __gitcomp "$u -- $(__hub_github_repos '\p')"
-    elif [ -z "$subpage" ]; then
-      case "$cur" in
-        */*)
-          local pfx="${cur%/*}" cur_="${cur#*/}"
-          local subpages_var="subpages_$pfx"
-          __gitcomp "${!subpages_var}" "$pfx/" "$cur_"
-          ;;
-        *)
-          __gitcomp "$u ${subpages_}"
-          ;;
-      esac
-    else
-      __gitcomp "$u"
-    fi
-  }
-
-  # hub compare [-u] [USER[/REPOSITORY]] [[START...]END]
-  _git_compare() {
-    local i c=$((cword - 1)) u=-u user remote owner repo arg_repo rev
-    while [ $c -gt 1 ]; do
-      i="${words[c]}"
-      case "$i" in
-        -u)
-          unset u
-          ;;
-        *)
-          if [ -z "$rev" ]; then
-            # Even though the logic below is able to complete both user/repo
-            # and revision in the right place, when there is only one argument
-            # (other than -u) in the command, that argument will be taken as
-            # revision. For example:
-            # $ hub compare -u upstream
-            # > https://github.com/USER/REPO/compare/upstream
-            if __hub_github_repos '\p' | grep -Eqx "^$i(/[^/]+)?"; then
-              arg_repo=$i
-            else
-              rev=$i
-            fi
-          elif [ -z "$arg_repo" ]; then
-            arg_repo=$i
-          fi
-          ;;
-      esac
-      ((c--))
-    done
-
-    # Here we want to find out the git remote name of user/repo, in order to
-    # generate an appropriate revision list
-    if [ -z "$arg_repo" ]; then
-      user=$(__hub_github_user)
-      if [ -z "$user" ]; then
-        for i in $(__hub_github_repos); do
-          remote=${i%%:*}
-          repo=${i#*:}
-          if [ "$remote" = origin ]; then
-            break
-          fi
-        done
-      else
-        for i in $(__hub_github_repos); do
-          remote=${i%%:*}
-          repo=${i#*:}
-          owner=${repo%%/*}
-          if [ "$user" = "$owner" ]; then
-            break
-          fi
-        done
-      fi
-    else
-      for i in $(__hub_github_repos); do
-        remote=${i%%:*}
-        repo=${i#*:}
-        owner=${repo%%/*}
-        case "$arg_repo" in
-          "$repo"|"$owner")
-            break
-            ;;
-        esac
-      done
-    fi
-
-    local pfx cur_="$cur"
-    case "$cur_" in
-      *..*)
-        pfx="${cur_%%..*}..."
-        cur_="${cur_##*..}"
-        __gitcomp_nl "$(__hub_revlist $remote)" "$pfx" "$cur_"
-        ;;
-      *)
-        if [ -z "${arg_repo}${rev}" ]; then
-          __gitcomp "$u $(__hub_github_repos '\o\n\p') $(__hub_revlist $remote)"
-        elif [ -z "$rev" ]; then
-          __gitcomp "$u $(__hub_revlist $remote)"
-        else
-          __gitcomp "$u"
-        fi
-        ;;
-    esac
-  }
-
-  # hub create [NAME] [-p] [-d DESCRIPTION] [-h HOMEPAGE]
-  _git_create() {
-    local i c=2 name repo flags="-p -d -h"
-    while [ $c -lt $cword ]; do
-      i="${words[c]}"
-      case "$i" in
-        -d|-h)
-          ((c++))
-          flags=${flags/$i/}
-          ;;
-        -p)
-          flags=${flags/$i/}
-          ;;
-        *)
-          name=$i
-          ;;
-      esac
-      ((c++))
-    done
-    if [ -z "$name" ]; then
-      repo=$(basename "$(pwd)")
-    fi
-    case "$prev" in
-      -d|-h)
-        COMPREPLY=()
-        ;;
-      -p|*)
-        __gitcomp "$repo $flags"
-        ;;
-    esac
-  }
-
-  # hub fork [--no-remote]
-  _git_fork() {
-    local i c=2 remote=yes
-    while [ $c -lt $cword ]; do
-      i="${words[c]}"
-      case "$i" in
-        --no-remote)
-          unset remote
-          ;;
-      esac
-      ((c++))
-    done
-    if [ -n "$remote" ]; then
-      __gitcomp "--no-remote"
-    fi
-  }
-
-  # hub pull-request [-f] [-m <MESSAGE>|-F <FILE>|-i <ISSUE>|<ISSUE-URL>] [-b <BASE>] [-h <HEAD>]
-  _git_pull_request() {
-    local i c=2 flags="-f -m -F -i -b -h"
-    while [ $c -lt $cword ]; do
-      i="${words[c]}"
-      case "$i" in
-        -m|-F|-i|-b|-h)
-          ((c++))
-          flags=${flags/$i/}
-          ;;
-        -f)
-          flags=${flags/$i/}
-          ;;
-      esac
-      ((c++))
-    done
-    case "$prev" in
-      -i)
-        COMPREPLY=()
-        ;;
-      -b|-h)
-        # (Doesn't seem to need this...)
-        # Uncomment the following line when 'owner/repo:[TAB]' misbehaved
-        #_get_comp_words_by_ref -n : cur
-        __gitcomp_nl "$(__hub_heads)"
-        # __ltrim_colon_completions "$cur"
-        ;;
-      -F)
-        COMPREPLY=( "$cur"* )
-        ;;
-      -f|*)
-        __gitcomp "$flags"
-        ;;
-    esac
-  }
-
-  ###################
-  # Helper functions
-  ###################
-
-  # __hub_github_user [HOST]
-  # Return $GITHUB_USER or the default github user defined in hub config
-  # HOST - Host to be looked-up in hub config. Default is "github.com"
-  __hub_github_user() {
-    if [ -n "$GITHUB_USER" ]; then
-      echo $GITHUB_USER
-      return
-    fi
-    local line h k v host=${1:-github.com} config=${HUB_CONFIG:-~/.config/gh}
-    if [ -f "$config" ]; then
-      while read line; do
-        if [ "$line" = "---" ]; then
-          continue
-        fi
-        k=${line%%:*}
-        v=${line#*:}
-        if [ -z "$v" ]; then
-          if [ "$h" = "$host" ]; then
-            break
-          fi
-          h=$k
-          continue
-        fi
-        k=${k#* }
-        v=${v#* }
-        if [ "$h" = "$host" ] && [ "$k" = "user" ]; then
-          echo "$v"
-          break
-        fi
-      done < "$config"
-    fi
-  }
-
-  # __hub_github_repos [FORMAT]
-  # List all github hosted repository
-  # FORMAT - Format string contains multiple of these:
-  #   \m  remote
-  #   \p  owner/repo
-  #   \o  owner
-  #   escaped characters (\n, \t ...etc) work
-  # If omitted, prints all github repos in the format of "remote:owner/repo"
-  __hub_github_repos() {
-    local f format=$1
-    if [ -z "$(__gitdir)" ]; then
-      return
-    fi
-    if [ -z "$format" ]; then
-      format='\1:\2'
-    else
-      format=${format//\m/\1}
-      format=${format//\p/\2}
-      format=${format//\o/\3}
-    fi
-    command git config --get-regexp 'remote\.[^.]*\.url' |
-    grep -E ' ((https?|git)://|git@)github\.com[:/][^:/]+/[^/]+$' |
-    sed -E 's#^remote\.([^.]+)\.url +.+[:/](([^/]+)/[^.]+)(\.git)?$#'"$format"'#'
-  }
-
-  # __hub_heads
-  # List all local "branch", and remote "owner/repo:branch"
-  __hub_heads() {
-    local i remote repo branch dir=$(__gitdir)
-    if [ -d "$dir" ]; then
-      command git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
-        "refs/heads/"
-      for i in $(__hub_github_repos); do
-        remote=${i%%:*}
-        repo=${i#*:}
-        command git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
-          "refs/remotes/${remote}/" | while read branch; do
-          echo "${repo}:${branch#${remote}/}"
-        done
-      done
-    fi
-  }
-
-  # __hub_revlist [REMOTE]
-  # List all tags, and branches under REMOTE, without the "remote/" prefix
-  # REMOTE - Remote name to search branches from. Default is "origin"
-  __hub_revlist() {
-    local i remote=${1:-origin} dir=$(__gitdir)
-    if [ -d "$dir" ]; then
-      command git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
-        "refs/remotes/${remote}/" | while read i; do
-        echo "${i#${remote}/}"
-      done
-      command git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
-        "refs/tags/"
-    fi
-  }
-
-  # Enable completion for hub even when not using the alias
-  complete -o bashdefault -o default -o nospace -F _git gh 2>/dev/null \
-    || complete -o default -o nospace -F _git gh
-fi
-
diff --git a/plugins/available/gh.plugin.bash b/plugins/available/gh.plugin.bash
deleted file mode 100644
index fb429317..00000000
--- a/plugins/available/gh.plugin.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-cite about-plugin
-about-plugin 'load gh, if you are using it (DEPRECATED, use hub instead)'
-
-command -v gh 2> /dev/null && eval "$(gh alias -s)"

From 24c05995e740227a9aadf27cbfc998048275ff12 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 10 Oct 2020 04:02:30 +0300
Subject: [PATCH 300/388] helpers: Auto reload now only reloads and not reset
 the shell

---
 lib/helpers.bash | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index da3abc0a..d4e85fc9 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -114,6 +114,10 @@ bash-it ()
         do
             $func $arg
         done
+
+        if [ -n "$BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE" ]; then
+          _bash-it-reload
+        fi
     else
         $func "$@"
     fi
@@ -239,6 +243,10 @@ _bash-it-migrate() {
     done
   done
 
+  if [ -n "$BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE" ]; then
+    _bash-it-reload
+  fi
+
   if [ "$migrated_something" = "true" ]; then
     echo ""
     echo "If any migration errors were reported, please try the following: reload && bash-it migrate"
@@ -455,10 +463,6 @@ _disable-thing ()
 
     _bash-it-clean-component-cache "${file_type}"
 
-    if [ -n "$BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE" ]; then
-        exec ${0/-/}
-    fi
-
     printf '%s\n' "$file_entity disabled."
 }
 
@@ -555,10 +559,6 @@ _enable-thing ()
 
     _bash-it-clean-component-cache "${file_type}"
 
-    if [ -n "$BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE" ]; then
-        exec ${0/-/}
-    fi
-
     printf '%s\n' "$file_entity enabled with priority $use_load_priority."
 }
 

From f4279e63c1bc714fa522edd955dea06e96be8118 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 12 Oct 2020 15:29:36 +0300
Subject: [PATCH 301/388] Add bash-it restart command

Also add completion and completion tests
---
 completion/available/bash-it.completion.bash |  2 +-
 lib/helpers.bash                             | 22 +++++++++++++++++++-
 test/completion/bash-it.completion.bats      | 12 +++++------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/completion/available/bash-it.completion.bash b/completion/available/bash-it.completion.bash
index c13e8623..29f81076 100644
--- a/completion/available/bash-it.completion.bash
+++ b/completion/available/bash-it.completion.bash
@@ -65,7 +65,7 @@ _bash-it-comp()
   prev="${COMP_WORDS[COMP_CWORD-1]}"
   chose_opt="${COMP_WORDS[1]}"
   file_type="${COMP_WORDS[2]}"
-  opts="disable enable help migrate reload doctor search show update version"
+  opts="disable enable help migrate reload restart doctor search show update version"
   case "${chose_opt}" in
     show)
       local show_args="aliases completions plugins"
diff --git a/lib/helpers.bash b/lib/helpers.bash
index d4e85fc9..73ae1672 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -45,7 +45,7 @@ alias reload_plugins="$(_make_reload_alias plugin plugins)"
 bash-it ()
 {
     about 'Bash-it help and maintenance'
-    param '1: verb [one of: help | show | enable | disable | migrate | update | search | version | reload | doctor ] '
+    param '1: verb [one of: help | show | enable | disable | migrate | update | search | version | reload | restart | doctor ] '
     param '2: component type [one of: alias(es) | completion(s) | plugin(s) ] or search term(s)'
     param '3: specific component [optional]'
     example '$ bash-it show plugins'
@@ -57,6 +57,7 @@ bash-it ()
     example '$ bash-it search [-|@]term1 [-|@]term2 ... [ -e/--enable ] [ -d/--disable ] [ -r/--refresh ] [ -c/--no-color ]'
     example '$ bash-it version'
     example '$ bash-it reload'
+    example '$ bash-it restart'
     example '$ bash-it doctor errors|warnings|all'
     typeset verb=${1:-}
     shift
@@ -84,6 +85,8 @@ bash-it ()
         func=_bash-it-migrate;;
       version)
         func=_bash-it-version;;
+      restart)
+        func=_bash-it-restart;;
       reload)
         func=_bash-it-reload;;
       *)
@@ -314,6 +317,23 @@ _bash-it-doctor-() {
   _bash-it-doctor-all
 }
 
+_bash-it-restart() {
+  _about 'restarts the shell in order to fully reload it'
+  _group 'lib'
+
+  saved_pwd=$(pwd)
+
+  case $OSTYPE in
+    darwin*)
+      init_file=.bash_profile
+      ;;
+    *)
+      init_file=.bashrc
+      ;;
+  esac
+  exec "${0/-/}" --rcfile <(echo "source \"$HOME/$init_file\"; cd \"$saved_pwd\"")
+}
+
 _bash-it-reload() {
   _about 'reloads a profile file'
   _group 'lib'
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index e453ae43..4945d939 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -75,32 +75,32 @@ function __check_completion () {
 
 @test "completion bash-it: show options" {
   run __check_completion 'bash-it '
-  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
+  assert_line -n 0 "disable enable help migrate reload restart doctor search show update version"
 }
 
 @test "completion bash-it: bash-ti - show options" {
   run __check_completion 'bash-ti '
-  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
+  assert_line -n 0 "disable enable help migrate reload restart doctor search show update version"
 }
 
 @test "completion bash-it: shit - show options" {
   run __check_completion 'shit '
-  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
+  assert_line -n 0 "disable enable help migrate reload restart doctor search show update version"
 }
 
 @test "completion bash-it: bashit - show options" {
   run __check_completion 'bashit '
-  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
+  assert_line -n 0 "disable enable help migrate reload restart doctor search show update version"
 }
 
 @test "completion bash-it: batshit - show options" {
   run __check_completion 'batshit '
-  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
+  assert_line -n 0 "disable enable help migrate reload restart doctor search show update version"
 }
 
 @test "completion bash-it: bash_it - show options" {
   run __check_completion 'bash_it '
-  assert_line -n 0 "disable enable help migrate reload doctor search show update version"
+  assert_line -n 0 "disable enable help migrate reload restart doctor search show update version"
 }
 
 @test "completion bash-it: show - show options" {

From 5dc1c1d5890b3a68bb5583e788cebde7a16cb68a Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 16 May 2020 11:53:49 +0300
Subject: [PATCH 302/388] alias: git: Add git pull / git push --force aliases

---
 aliases/available/git.aliases.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index bff379ad..bf959121 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -22,6 +22,7 @@ alias gs='git status'
 alias gss='git status -s'
 alias gsu='git submodule update --init --recursive'
 alias gl='git pull'
+alias gpl='git pull'
 alias glum='git pull upstream master'
 alias gpr='git pull --rebase'
 alias gpp='git pull && git push'
@@ -84,6 +85,7 @@ alias gnew="git log HEAD@{1}..HEAD@{0}"
 alias gcaa="git commit -a --amend -C HEAD"
 # Rebase with latest remote master
 alias gprom="git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master"
+alias gpf="git push --force"
 alias gpunch="git push --force-with-lease"
 alias ggui="git gui"
 alias gcsam="git commit -S -am"

From d46fc18bd4ed763c787767dcb45452dfb6cdd0d4 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 24 Jun 2020 15:13:33 +0300
Subject: [PATCH 303/388] alias: git: Add new pretty git log alias (ggf)

---
 aliases/available/git.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index bf959121..83cd071a 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -69,6 +69,7 @@ alias gdel='git branch -D'
 alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
 alias gll='git log --graph --pretty=oneline --abbrev-commit'
 alias gg="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
+alias ggf="git log --graph --date=short --pretty=format:'%C(auto)%h %Cgreen%an%Creset %Cblue%cd%Creset %C(auto)%d %s'"
 alias ggs="gg --stat"
 alias gsh="git show"
 alias gsl="git shortlog -sn"

From 96295e92a5668b0db607b3e7c875085eb982daed Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 22 Jun 2020 16:19:37 +0300
Subject: [PATCH 304/388] lib: Improve bash-it update so it can update to
 latest tag

---
 lib/helpers.bash | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index d4e85fc9..51d6517b 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -79,7 +79,7 @@ bash-it ()
         _bash-it-search $component "$@"
         return;;
       update)
-        func=_bash-it_update;;
+        func=_bash-it_update-$component;;
       migrate)
         func=_bash-it-migrate;;
       version)
@@ -155,26 +155,49 @@ _bash-it-plugins ()
     _bash-it-describe "plugins" "a" "plugin" "Plugin"
 }
 
-_bash-it_update() {
+_bash-it_update-dev() {
+  _about 'updates Bash-it to the latest master'
+  _group 'lib'
+
+  _bash-it_update- dev
+}
+
+_bash-it_update-stable() {
+  _about 'updates Bash-it to the latest tag'
+  _group 'lib'
+
+  _bash-it_update- stable
+}
+
+_bash-it_update-() {
   _about 'updates Bash-it'
+  _param '1: What kind of update to do (stable|dev)'
   _group 'lib'
 
   local old_pwd="${PWD}"
 
   cd "${BASH_IT}" || return
 
-  if [ -z $BASH_IT_REMOTE ]; then
+  if [ -z "$BASH_IT_REMOTE" ]; then
     BASH_IT_REMOTE="origin"
   fi
+  # Defaults to stable update
+  if [ -z "$1" ] || [ "$1" == "stable" ]; then
+    version="stable"
+    TARGET=$(git describe --tags "$(git rev-list --tags --max-count=1)")
+  else
+    version="dev"
+    TARGET=${BASH_IT_REMOTE}/master
+  fi
 
-  git fetch &> /dev/null
+  git fetch $BASH_IT_REMOTE --tags &> /dev/null
 
   declare status
-  status="$(git rev-list master..${BASH_IT_REMOTE}/master 2> /dev/null)"
+  status="$(git rev-list HEAD.."${TARGET}" 2> /dev/null)"
 
   if [[ -n "${status}" ]]; then
 
-    for i in $(git rev-list --merges --first-parent master..${BASH_IT_REMOTE}); do
+    for i in $(git rev-list --merges --first-parent HEAD.."${TARGET}"); do
       num_of_lines=$(git log -1 --format=%B $i | awk 'NF' | wc -l)
       if [ $num_of_lines -eq 1 ]; then
         description="%s"
@@ -184,14 +207,14 @@ _bash-it_update() {
       git log --format="%h: $description (%an)" -1 $i
     done
     echo ""
-    read -e -n 1 -p "Would you like to update to $(git log -1 --format=%h origin/master)? [Y/n] " RESP
+    read -e -n 1 -p "Would you like to update to ${TARGET}($(git log -1 --format=%h "${TARGET}"))? [Y/n] " RESP
     case $RESP in
       [yY]|"")
-        git pull --rebase &> /dev/null
+        git checkout "${TARGET}" &> /dev/null
         if [[ $? -eq 0 ]]; then
           echo "Bash-it successfully updated."
           echo ""
-          echo "Migrating your installation to the latest version now..."
+          echo "Migrating your installation to the latest $version version now..."
           _bash-it-migrate
           echo ""
           echo "All done, enjoy!"

From 1bdcacf2422f70d2cd1fe0a1b4fb09958022dcdc Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 22 Jun 2020 16:19:52 +0300
Subject: [PATCH 305/388] completion: Update completion for new bash-it update

Also fix the update completion test
---
 completion/available/bash-it.completion.bash | 7 ++++++-
 test/completion/bash-it.completion.bats      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/completion/available/bash-it.completion.bash b/completion/available/bash-it.completion.bash
index c13e8623..87c84a22 100644
--- a/completion/available/bash-it.completion.bash
+++ b/completion/available/bash-it.completion.bash
@@ -87,7 +87,12 @@ _bash-it-comp()
       COMPREPLY=( $(compgen -W "${doctor_args}" -- ${cur}) )
       return 0
       ;;
-    migrate | reload | search | update | version)
+    update)
+      local update_args="stable dev"
+      COMPREPLY=( $(compgen -W "${update_args}" -- ${cur}) )
+      return 0
+      ;;
+    migrate | reload | search | version)
       return 0
       ;;
     enable | disable)
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index e453ae43..44eefc75 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -58,9 +58,9 @@ function __check_completion () {
   assert_line -n 0 "vagrant vault vim"
 }
 
-@test "completion bash-it: update - show no options" {
+@test "completion bash-it: update - show options" {
   run __check_completion 'bash-it update '
-  assert_line -n 0 ""
+  assert_line -n 0 "stable dev"
 }
 
 @test "completion bash-it: search - show no options" {

From d8c2256c3912475ee3f8855b875bd3bad92a853f Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 14 Jul 2020 13:47:21 +0300
Subject: [PATCH 306/388] doc: Add stable/dev option to update section

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 26ac5cb7..6a0449b2 100644
--- a/README.md
+++ b/README.md
@@ -87,13 +87,17 @@ Have a look at our [bash-it-docker repository](https://github.com/Bash-it/bash-i
 
 ### Updating
 
-To update Bash-it to the latest version, simply run:
+To update Bash-it to the latest stable version, simply run:
 
 ```bash
-bash-it update
+bash-it update stable
 ```
 
-that's all.
+If you want to update to the latest dev version (directly from master), run:
+
+```bash
+bash-it update dev
+```
 
 If you are using an older version of Bash-it, it's possible that some functionality has changed, or that the internal structure of how Bash-it organizes its functionality has been updated.
 For these cases, we provide a `migrate` command:

From ecf65569cefff5201432b064c705664c80babaa0 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 17 Jul 2020 15:50:40 +0300
Subject: [PATCH 307/388] lib: Update to stable now correctly fails if no tags
 are present

---
 lib/helpers.bash | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 51d6517b..35cabc42 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -184,7 +184,12 @@ _bash-it_update-() {
   # Defaults to stable update
   if [ -z "$1" ] || [ "$1" == "stable" ]; then
     version="stable"
-    TARGET=$(git describe --tags "$(git rev-list --tags --max-count=1)")
+    TARGET=$(git describe --tags "$(git rev-list --tags --max-count=1)" 2> /dev/null)
+
+    if [[ -z "$TARGET" ]]; then
+      echo "Can not find tags, so can not update to latest stable version..."
+      return
+    fi
   else
     version="dev"
     TARGET=${BASH_IT_REMOTE}/master

From 8e6876719b82b380af161e154b7e6a147c954b58 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 17 Jul 2020 16:36:57 +0300
Subject: [PATCH 308/388] lib: Add BASH_IT_DEVELOPMENT_BRANCH variable

---
 lib/helpers.bash                    | 5 ++++-
 template/bash_profile.template.bash | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 35cabc42..b163cfc8 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -181,6 +181,9 @@ _bash-it_update-() {
   if [ -z "$BASH_IT_REMOTE" ]; then
     BASH_IT_REMOTE="origin"
   fi
+  if [ -z "$BASH_IT_DEVELOPMENT_BRANCH" ]; then
+    BASH_IT_DEVELOPMENT_BRANCH="master"
+  fi
   # Defaults to stable update
   if [ -z "$1" ] || [ "$1" == "stable" ]; then
     version="stable"
@@ -192,7 +195,7 @@ _bash-it_update-() {
     fi
   else
     version="dev"
-    TARGET=${BASH_IT_REMOTE}/master
+    TARGET=${BASH_IT_REMOTE}/${BASH_IT_DEVELOPMENT_BRANCH}
   fi
 
   git fetch $BASH_IT_REMOTE --tags &> /dev/null
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index f8f4705f..4a840df3 100755
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -18,6 +18,10 @@ export BASH_IT_THEME='bobby'
 # cloned bash-it with a remote other than origin such as `bash-it`.
 # export BASH_IT_REMOTE='bash-it'
 
+# (Advanced): Change this to the name of the main development branch if
+# you renamed it or if it was changed for some reason
+# export BASH_IT_DEVELOPMENT_BRANCH='master'
+
 # Your place for hosting Git repos. I use this for private repos.
 export GIT_HOSTING='git@git.domain.com'
 

From 9b208e7d5c1eab0378a408ab9e03b55a89ee06ed Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 17 Jul 2020 18:00:31 +0300
Subject: [PATCH 309/388] lib: Update no-op message in case of stable update

---
 lib/helpers.bash | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index b163cfc8..e7265489 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -239,7 +239,11 @@ _bash-it_update-() {
         ;;
       esac
   else
-    echo "Bash-it is up to date, nothing to do!"
+    if [[ ${version} == "stable" ]]; then
+      echo "You're on the latest stable version. If you want to check out the latest 'dev' version, please run \"bash-it update dev\""
+    else
+      echo "Bash-it is up to date, nothing to do!"
+    fi
   fi
   cd "${old_pwd}" &> /dev/null || return
 }

From 4ca6dd9a366f1256e522fc067ad42bb57fb788de Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 19 Jun 2020 17:56:09 +0300
Subject: [PATCH 310/388] helpers: Add --slient option to bash-it update

---
 lib/helpers.bash | 66 ++++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index e7265489..2cb0b18c 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -159,14 +159,29 @@ _bash-it_update-dev() {
   _about 'updates Bash-it to the latest master'
   _group 'lib'
 
-  _bash-it_update- dev
+  _bash-it_update- dev "$@"
 }
 
 _bash-it_update-stable() {
   _about 'updates Bash-it to the latest tag'
   _group 'lib'
 
-  _bash-it_update- stable
+  _bash-it_update- stable "$@"
+}
+
+_bash-it_pull_and_update_inner() {
+  git checkout "$1" &> /dev/null
+  if [[ $? -eq 0 ]]; then
+    echo "Bash-it successfully updated."
+    echo ""
+    echo "Migrating your installation to the latest $2 version now..."
+    _bash-it-migrate
+    echo ""
+    echo "All done, enjoy!"
+    bash-it reload
+  else
+    echo "Error updating Bash-it, please, check if your Bash-it installation folder (${BASH_IT}) is clean."
+  fi
 }
 
 _bash-it_update-() {
@@ -174,6 +189,12 @@ _bash-it_update-() {
   _param '1: What kind of update to do (stable|dev)'
   _group 'lib'
 
+  declare silent
+  for word in $@; do
+    if [[ ${word} == "--silent" || ${word} == "-s" ]]; then
+      silent=true
+    fi
+  done
   local old_pwd="${PWD}"
 
   cd "${BASH_IT}" || return
@@ -215,29 +236,24 @@ _bash-it_update-() {
       git log --format="%h: $description (%an)" -1 $i
     done
     echo ""
-    read -e -n 1 -p "Would you like to update to ${TARGET}($(git log -1 --format=%h "${TARGET}"))? [Y/n] " RESP
-    case $RESP in
-      [yY]|"")
-        git checkout "${TARGET}" &> /dev/null
-        if [[ $? -eq 0 ]]; then
-          echo "Bash-it successfully updated."
-          echo ""
-          echo "Migrating your installation to the latest $version version now..."
-          _bash-it-migrate
-          echo ""
-          echo "All done, enjoy!"
-          bash-it reload
-        else
-          echo "Error updating Bash-it, please, check if your Bash-it installation folder (${BASH_IT}) is clean."
-        fi
-        ;;
-      [nN])
-        echo "Not upgrading…"
-        ;;
-      *)
-        echo -e "\033[91mPlease choose y or n.\033[m"
-        ;;
-      esac
+
+    if [[ $silent ]]; then
+      echo "Updating to ${TARGET}($(git log -1 --format=%h "${TARGET}"))..."
+      _bash-it_pull_and_update_inner $TARGET $version
+    else
+      read -e -n 1 -p "Would you like to update to ${TARGET}($(git log -1 --format=%h "${TARGET}"))? [Y/n] " RESP
+      case $RESP in
+        [yY]|"")
+          _bash-it_pull_and_update_inner $TARGET $version
+          ;;
+        [nN])
+          echo "Not upgrading…"
+          ;;
+        *)
+          echo -e "\033[91mPlease choose y or n.\033[m"
+          ;;
+        esac
+    fi
   else
     if [[ ${version} == "stable" ]]; then
       echo "You're on the latest stable version. If you want to check out the latest 'dev' version, please run \"bash-it update dev\""

From 3f2c6e79ee9c22c2e9648d218842c0d08f3ec564 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 14 Jul 2020 13:50:20 +0300
Subject: [PATCH 311/388] doc: Add --silent flag documentation

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 6a0449b2..1da1f7eb 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,13 @@ If you want to update to the latest dev version (directly from master), run:
 bash-it update dev
 ```
 
+If you want to update automatically and unattended, you can add the optional
+`-s/--silent` flag, for example:
+
+```bash
+bash-it update dev --silent
+```
+
 If you are using an older version of Bash-it, it's possible that some functionality has changed, or that the internal structure of how Bash-it organizes its functionality has been updated.
 For these cases, we provide a `migrate` command:
 

From 2fd1cd66e4db2c9979d2d0d6f1953b3289ff4ba8 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 14 Jul 2020 18:05:51 +0300
Subject: [PATCH 312/388] completion: Add --silent and -s completion

---
 completion/available/bash-it.completion.bash | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/completion/available/bash-it.completion.bash b/completion/available/bash-it.completion.bash
index 87c84a22..c9b4b683 100644
--- a/completion/available/bash-it.completion.bash
+++ b/completion/available/bash-it.completion.bash
@@ -88,7 +88,11 @@ _bash-it-comp()
       return 0
       ;;
     update)
-      local update_args="stable dev"
+      if [[ ${cur} == -* ]];then
+        local update_args="-s --silent"
+      else
+        local update_args="stable dev"
+      fi
       COMPREPLY=( $(compgen -W "${update_args}" -- ${cur}) )
       return 0
       ;;

From fc17169b1cf423e5e6dac729e919004ab254daf6 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 17 Jul 2020 16:40:11 +0300
Subject: [PATCH 313/388] test: Add completion test for -s --silent flag

---
 test/completion/bash-it.completion.bats | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index 44eefc75..902c4b42 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -63,6 +63,11 @@ function __check_completion () {
   assert_line -n 0 "stable dev"
 }
 
+@test "completion bash-it: update - show optional flags" {
+  run __check_completion 'bash-it update -'
+  assert_line -n 0 "-s --silent"
+}
+
 @test "completion bash-it: search - show no options" {
   run __check_completion 'bash-it search '
   assert_line -n 0 ""

From 0a9b43e86d432f3b915c9381a0065a87cdcb0146 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 18 Jul 2020 11:41:52 +0300
Subject: [PATCH 314/388] lib: Fetch from remote before calculating latest tag
 in bash-it update

---
 lib/helpers.bash | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 2cb0b18c..ff8fddda 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -202,6 +202,9 @@ _bash-it_update-() {
   if [ -z "$BASH_IT_REMOTE" ]; then
     BASH_IT_REMOTE="origin"
   fi
+
+  git fetch $BASH_IT_REMOTE --tags &> /dev/null
+
   if [ -z "$BASH_IT_DEVELOPMENT_BRANCH" ]; then
     BASH_IT_DEVELOPMENT_BRANCH="master"
   fi
@@ -219,8 +222,6 @@ _bash-it_update-() {
     TARGET=${BASH_IT_REMOTE}/${BASH_IT_DEVELOPMENT_BRANCH}
   fi
 
-  git fetch $BASH_IT_REMOTE --tags &> /dev/null
-
   declare status
   status="$(git rev-list HEAD.."${TARGET}" 2> /dev/null)"
 

From 6bed26eccb19259eb3da3d73b635e59522b194e5 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 13 Oct 2020 14:55:03 +0300
Subject: [PATCH 315/388] lib: helpers: Rename Upgrading -> Updating

---
 lib/helpers.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index ff8fddda..31628d27 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -248,7 +248,7 @@ _bash-it_update-() {
           _bash-it_pull_and_update_inner $TARGET $version
           ;;
         [nN])
-          echo "Not upgrading…"
+          echo "Not updating…"
           ;;
         *)
           echo -e "\033[91mPlease choose y or n.\033[m"

From a1adfaaa3e84927b7a0b86ee4bc9b4eacd30e6bf Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 13 Oct 2020 15:02:37 +0300
Subject: [PATCH 316/388] lib: helpers: Handle stable revert update

---
 lib/helpers.bash | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 31628d27..1bb2ad28 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -222,19 +222,34 @@ _bash-it_update-() {
     TARGET=${BASH_IT_REMOTE}/${BASH_IT_DEVELOPMENT_BRANCH}
   fi
 
+  declare revision
+  revision="HEAD..${TARGET}"
   declare status
-  status="$(git rev-list HEAD.."${TARGET}" 2> /dev/null)"
+  status="$(git rev-list ${revision} 2> /dev/null)"
+  declare revert
+
+  if [[ -z "${status}" && ${version} == "stable" ]]; then
+    revision="${TARGET}..HEAD"
+    status="$(git rev-list ${revision} 2> /dev/null)"
+    revert=true
+  fi
 
   if [[ -n "${status}" ]]; then
+    if [[ $revert ]]; then
+      echo "Your version is a more recent development version ($(git log -1 --format=%h HEAD))"
+      echo "You can continue in order to revert and update to the latest stable version"
+      echo ""
+      log_color="%Cred"
+    fi
 
-    for i in $(git rev-list --merges --first-parent HEAD.."${TARGET}"); do
+    for i in $(git rev-list --merges --first-parent ${revision}); do
       num_of_lines=$(git log -1 --format=%B $i | awk 'NF' | wc -l)
       if [ $num_of_lines -eq 1 ]; then
         description="%s"
       else
         description="%b"
       fi
-      git log --format="%h: $description (%an)" -1 $i
+      git log --format="${log_color}%h: $description (%an)" -1 $i
     done
     echo ""
 

From beb3b06e3fb5f845936cc32b14b765de8a3b082b Mon Sep 17 00:00:00 2001
From: Grzegorz Szczudlik <grzegorz.szczudlik@applica.ai>
Date: Wed, 14 Oct 2020 17:40:29 +0200
Subject: [PATCH 317/388] Add Terraform and Terragrunt aliases

---
 aliases/available/terraform.aliases.bash  | 11 +++++++++++
 aliases/available/terragrunt.aliases.bash | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 aliases/available/terraform.aliases.bash
 create mode 100644 aliases/available/terragrunt.aliases.bash

diff --git a/aliases/available/terraform.aliases.bash b/aliases/available/terraform.aliases.bash
new file mode 100644
index 00000000..af5276de
--- /dev/null
+++ b/aliases/available/terraform.aliases.bash
@@ -0,0 +1,11 @@
+# Aliases for Terraform and Terragrunt
+
+cite 'about-alias'
+about-alias 'Terraform abbreviations'
+
+alias tf='terraform'
+alias tfv='terraform validate'
+alias tfp='terraform plan'
+alias tfa='terraform apply'
+alias tfd='terraform destory'
+
diff --git a/aliases/available/terragrunt.aliases.bash b/aliases/available/terragrunt.aliases.bash
new file mode 100644
index 00000000..f1d7e182
--- /dev/null
+++ b/aliases/available/terragrunt.aliases.bash
@@ -0,0 +1,16 @@
+# Aliases for Terraform and Terragrunt
+
+cite 'about-alias'
+about-alias 'Terragrunt abbreviations'
+
+alias tg='terragrunt'
+alias tgv='terragrunt validate'
+alias tgp='terragrunt plan'
+alias tga='terragrunt apply'
+alias tgd='terragrunt destroy'
+
+alias tgva='terragrunt validate-all'
+alias tgpa='terragrunt plan-all'
+alias tgaa='terragrunt apply-all'
+alias tgda='terragrunt destroy-all'
+

From b82a827ae639e25d80b782c525361ae5d9432cb4 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Thu, 15 Oct 2020 09:19:13 +0300
Subject: [PATCH 318/388] Fix the commandline for gifski

---
 plugins/available/gif.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/gif.plugin.bash b/plugins/available/gif.plugin.bash
index b549baab..49c36e4c 100644
--- a/plugins/available/gif.plugin.bash
+++ b/plugins/available/gif.plugin.bash
@@ -162,7 +162,7 @@ function v2gif {
     if [[ "$use_gifski" = "true" ]] ; then
       # I trust @pornel to do his own resizing optimization choices
       $ffmpeg -loglevel panic -i "$file" -r $fps -vcodec png v2gif-tmp-%05d.png && \
-        $gifski $maxwidthski --fps $(printf "%.0f" $fps) -o "$output_file" v2gif-tmp-*.png || return 2
+        $gifski v2gif-tmp-*.png $maxwidthski --fps $(printf "%.0f" $fps) -o "$output_file" || return 2
     else
       $ffmpeg -loglevel panic -i "$file" $maxsize -r $fps -vcodec png v2gif-tmp-%05d.png && \
         $convert +dither -layers Optimize v2gif-tmp-*.png GIF:- | \

From ecef6ed00823a117cde12b8a3f4246207ec9aefb Mon Sep 17 00:00:00 2001
From: Grzegorz Szczudlik <grzegorz.szczudlik@applica.ai>
Date: Wed, 14 Oct 2020 17:35:15 +0200
Subject: [PATCH 319/388] Add Kind support

---
 completion/available/kind.completion.bash | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 completion/available/kind.completion.bash

diff --git a/completion/available/kind.completion.bash b/completion/available/kind.completion.bash
new file mode 100644
index 00000000..f7b061fe
--- /dev/null
+++ b/completion/available/kind.completion.bash
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+if _command_exists kind; then
+  eval "$(kind completion bash)"
+fi
+

From fff5439242655d51fa1568e84e2fcc31a43a2a1a Mon Sep 17 00:00:00 2001
From: Gurkirat Singh <tbhaxor@gmail.com>
Date: Fri, 16 Oct 2020 02:25:42 +0530
Subject: [PATCH 320/388] added git alias to list remote branch creators with
 date and time

---
 aliases/available/git.aliases.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 83cd071a..be8d7330 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -51,6 +51,8 @@ alias gci='git commit --interactive'
 alias gcamd='git commit --amend'
 alias gb='git branch'
 alias gba='git branch -a'
+# FROM https://stackoverflow.com/a/58623139/10362396
+alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC'
 alias gbt='git branch --track'
 alias gbm='git branch -m'
 alias gbd='git branch -d'

From 8a36f21ca1f828b7a84d7a022993415ee870012d Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Wed, 21 Oct 2020 00:14:11 +0300
Subject: [PATCH 321/388] Add _binary_exists and use in github-cli completion

gh was also used as an git alias, and caused _command_exists to not fail as expected
---
 completion/available/github-cli.completion.bash |  2 +-
 lib/helpers.bash                                | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/completion/available/github-cli.completion.bash b/completion/available/github-cli.completion.bash
index 2fb3d370..7b7c9fa0 100644
--- a/completion/available/github-cli.completion.bash
+++ b/completion/available/github-cli.completion.bash
@@ -2,7 +2,7 @@
 cite "about-completion"
 about-completion "GitHub CLI completion"
 
-if _command_exists gh; then
+if _binary_exists gh; then
   if _command_exists brew; then
     _log_warning "You don't need github-cli completion enabled if you have system completion enabled"
   fi
diff --git a/lib/helpers.bash b/lib/helpers.bash
index 8917ed50..a709d507 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -26,6 +26,17 @@ function _command_exists ()
   type "$1" &> /dev/null || (_log_warning "$msg" && return 1) ;
 }
 
+function _binary_exists ()
+{
+  _about 'checks for existence of a binary'
+  _param '1: binary to check'
+  _param '2: (optional) log message to include when binary not found'
+  _example '$ _binary_exists ls && echo exists'
+  _group 'lib'
+  local msg="${2:-Binary '$1' does not exist!}"
+  type -P "$1" &> /dev/null || (_log_warning "$msg" && return 1) ;
+}
+
 function _make_reload_alias() {
   echo "source \${BASH_IT}/scripts/reloader.bash ${1} ${2}"
 }

From 5e65235d0ebd44cab4e494c64363bb6babefda84 Mon Sep 17 00:00:00 2001
From: BarbUk <BarbUk@users.noreply.github.com>
Date: Tue, 20 Oct 2020 23:27:48 +0200
Subject: [PATCH 322/388] Theme barbuk - add venv glyph and fix venv display in
 ssh mode (#1681)

* Add python venv glyph

* Fix venv display (tested for local and ssh prompt)

* Add documentation for python venv
---
 themes/barbuk/README.md         | 7 +++++++
 themes/barbuk/barbuk.theme.bash | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 87d23bad..fdc60719 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -29,6 +29,7 @@ BARBUK_GIT_BRANCH_ICON=''
 BARBUK_HG_CHAR='☿ '
 BARBUK_SVN_CHAR='⑆ '
 BARBUK_EXIT_CODE_ICON=' '
+BARBUK_PYTHON_VENV_CHAR=' '
 ```
 
 ### Customize glyphs
@@ -97,3 +98,9 @@ chmod 400 /etc/sudoers.d/keepenv
 ```bash
 user@hostname in  ~/bash-it on  master ✓ ❯
 ```
+
+### Python venv
+
+```bash
+  flask ~/test on  master ✓ ❯
+```
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 75790337..e1e7f2c1 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -10,6 +10,7 @@ SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
 SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
 SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
 EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
+PYTHON_VENV_CHAR=${BARBUK_PYTHON_VENV_CHAR:=' '}
 
 # Ssh user and hostname display
 SSH_INFO=${BARBUK_SSH_INFO:=true}
@@ -90,12 +91,12 @@ function _prompt {
 
     # Detect python venv
     if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-        python_venv="${CONDA_DEFAULT_ENV}"
+        python_venv="$PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV} "
     elif [[ -n "${VIRTUAL_ENV}" ]]; then
-        python_venv=$(basename "${VIRTUAL_ENV}")
+        python_venv="$PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}") "
     fi
 
-    PS1="\\n${ssh_info} ${python_venv} ${purple}$(scm_char)${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
+    PS1="\\n${ssh_info} ${purple}$(scm_char)${python_venv}${dir_color}\\w${normal}$(scm_prompt_info)${exit_code}"
 
     [[ ${#PS1} -gt $((COLUMNS*3)) ]] && wrap_char="\\n"
     PS1="${PS1}${wrap_char}❯${normal} "

From 3838f1249825d3516fcc7825f74b8a962863a40c Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Wed, 21 Oct 2020 11:02:55 +0300
Subject: [PATCH 323/388] Add tests for _binary_exists

---
 test/lib/helpers.bats | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats
index 70481b32..0a58be34 100644
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -39,6 +39,26 @@ function local_setup {
   assert_failure
 }
 
+@test "helpers: _binary_exists function exists" {
+  run type -a _binary_exists &> /dev/null
+  assert_success
+}
+
+@test "helpers: _binary_exists function positive test ls" {
+  run _binary_exists ls
+  assert_success
+}
+
+@test "helpers: _binary_exists function negative test function" {
+  run _binary_exists _binary_exists
+  assert_failure
+}
+
+@test "helpers: _binary_exists function negative test" {
+  run _binary_exists __addfkds_dfdsjdf
+  assert_failure
+}
+
 @test "helpers: bash-it help aliases ag" {
   run bash-it help aliases "ag"
   assert_line -n 0 "ag='ag --smart-case --pager=\"less -MIRFX'"

From 825fc88a8ffd5862676762ff581662428b4b2f78 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 25 Oct 2020 15:24:19 +0200
Subject: [PATCH 324/388] Rename _bash-it_update to _bash-it-update

---
 lib/helpers.bash | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index a709d507..58e5ffc3 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -91,7 +91,7 @@ bash-it ()
         _bash-it-search $component "$@"
         return;;
       update)
-        func=_bash-it_update-$component;;
+        func=_bash-it-update-$component;;
       migrate)
         func=_bash-it-migrate;;
       version)
@@ -169,18 +169,18 @@ _bash-it-plugins ()
     _bash-it-describe "plugins" "a" "plugin" "Plugin"
 }
 
-_bash-it_update-dev() {
+_bash-it-update-dev() {
   _about 'updates Bash-it to the latest master'
   _group 'lib'
 
-  _bash-it_update- dev "$@"
+  _bash-it-update- dev "$@"
 }
 
-_bash-it_update-stable() {
+_bash-it-update-stable() {
   _about 'updates Bash-it to the latest tag'
   _group 'lib'
 
-  _bash-it_update- stable "$@"
+  _bash-it-update- stable "$@"
 }
 
 _bash-it_pull_and_update_inner() {
@@ -198,7 +198,7 @@ _bash-it_pull_and_update_inner() {
   fi
 }
 
-_bash-it_update-() {
+_bash-it-update-() {
   _about 'updates Bash-it'
   _param '1: What kind of update to do (stable|dev)'
   _group 'lib'

From e023d6f85123f7aa36e4119aa57c9088d157c1a1 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Tue, 27 Oct 2020 20:01:45 +0200
Subject: [PATCH 325/388] Improve bash-it version output

As we now have "stable" releases and "dev" type of versions, `version` command should
provide usefull output on that
---
 lib/helpers.bash | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/helpers.bash b/lib/helpers.bash
index 58e5ffc3..270a31b9 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -347,12 +347,22 @@ _bash-it-version() {
   BASH_IT_GIT_REMOTE=$(git remote get-url $BASH_IT_REMOTE)
   BASH_IT_GIT_URL=${BASH_IT_GIT_REMOTE%.git}
 
-  BASH_IT_GIT_VERSION_INFO="$(git log --pretty=format:'%h on %aI' -n 1)"
-  BASH_IT_GIT_SHA=${BASH_IT_GIT_VERSION_INFO%% *}
+  current_tag=$(git describe --exact-match --tags 2> /dev/null)
 
-  echo "Current git SHA: $BASH_IT_GIT_VERSION_INFO"
-  echo "$BASH_IT_GIT_URL/commit/$BASH_IT_GIT_SHA"
-  echo "Compare to latest: $BASH_IT_GIT_URL/compare/$BASH_IT_GIT_SHA...master"
+  if [[ -z $current_tag ]]; then
+    BASH_IT_GIT_VERSION_INFO="$(git log --pretty=format:'%h on %aI' -n 1)"
+    TARGET=${BASH_IT_GIT_VERSION_INFO%% *}
+    echo "Version type: dev"
+    echo "Current git SHA: $BASH_IT_GIT_VERSION_INFO"
+    echo "Commit info: $BASH_IT_GIT_URL/commit/$TARGET"
+  else
+    TARGET=$current_tag
+    echo "Version type: stable"
+    echo "Current tag: $current_tag"
+    echo "Tag information: $BASH_IT_GIT_URL/releases/tag/$current_tag"
+  fi
+
+  echo "Compare to latest: $BASH_IT_GIT_URL/compare/$TARGET...master"
 
   cd - &> /dev/null || return
 }

From 313abebbb09cb30534361c276be5ba29702cb59f Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah.bar.ilan@gmail.com>
Date: Tue, 27 Oct 2020 20:06:37 +0200
Subject: [PATCH 326/388] git: Add git push --delete alias

---
 aliases/available/git.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index be8d7330..6b2badaa 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -28,6 +28,7 @@ alias gpr='git pull --rebase'
 alias gpp='git pull && git push'
 alias gup='git fetch && git rebase'
 alias gp='git push'
+alias gpd='git push --delete'
 alias gpo='git push origin HEAD'
 alias gpu='git push --set-upstream'
 alias gpuo='git push --set-upstream origin'

From 9ac6a6ab964d4f77356376042138fc08d206b5f0 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Tue, 15 Oct 2019 14:34:32 +0300
Subject: [PATCH 327/388] Enforce some coding standards for the contributers

---
 .pre-commit-config.yaml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..2443753a
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,35 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+---
+# fail_fast: true
+minimum_pre_commit_version: 1.18.1
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-docstring-first
+      - id: check-merge-conflict
+      - id: requirements-txt-fixer
+      - id: double-quote-string-fixer
+      - id: forbid-new-submodules
+      - id: mixed-line-ending
+      - id: check-added-large-files
+  - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    rev: 1.11.0
+    hooks:
+      - id: forbid-binary
+      - id: git-check  # Configure in .gitattributes
+      - id: git-dirty  # Configure in .gitignore
+      - id: markdownlint  # Configure in .mdlrc
+      - id: shellcheck
+      - id: shfmt
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.1.7
+    hooks:
+      # - id: forbid-crlf
+      - id: remove-crlf
+      # - id: forbid-tabs
+      - id: remove-tabs
+        args: [--whitespaces-count, '2']  # defaults to: 4

From 250bd2bbd8d74885427e19e2bcff407a589809b2 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Tue, 15 Oct 2019 15:05:52 +0300
Subject: [PATCH 328/388] Add a note on how to use the pre-commit yaml.

---
 DEVELOPMENT.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index e2fc7bd5..2f7941cb 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -64,3 +64,11 @@ These items are subject to change. When making changes to the internal functiona
 
 Plugins can define a function that will be called when the plugin is being disabled.
 The callback name should be `{PLUGIN_NAME}_on_disable`, you can see `gitstatus` for usage example.
+
+## Using the pre-commit hook
+
+Note the file .pre-commit-config.yaml at the top of the repo.
+This file configures the behavior of the a pre-commit hook based on [the Pre-Commit framework](https://pre-commit.com/). Please see the site about
+installing it (with pip, brew or other tools) then run `pre-commit install` in the repo's root to activate the hook.
+For the full use of the tool, you may need to install also other third-party tools, such as
+[shellcheck](https://github.com/koalaman/shellcheck/) and [shfmt](https://github.com/mvdan/sh).

From d986261f98c25a259b593feba290cfa9ab9156fc Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Tue, 15 Oct 2019 16:17:16 +0300
Subject: [PATCH 329/388] another round of refinements after PR #1434

---
 .pre-commit-config.yaml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2443753a..4fa61012 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,20 +9,13 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: check-docstring-first
       - id: check-merge-conflict
-      - id: requirements-txt-fixer
-      - id: double-quote-string-fixer
-      - id: forbid-new-submodules
       - id: mixed-line-ending
       - id: check-added-large-files
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
     rev: 1.11.0
     hooks:
-      - id: forbid-binary
       - id: git-check  # Configure in .gitattributes
-      - id: git-dirty  # Configure in .gitignore
-      - id: markdownlint  # Configure in .mdlrc
       - id: shellcheck
       - id: shfmt
   - repo: https://github.com/Lucas-C/pre-commit-hooks
@@ -33,3 +26,4 @@ repos:
       # - id: forbid-tabs
       - id: remove-tabs
         args: [--whitespaces-count, '2']  # defaults to: 4
+        exclude: .gitmodules

From 5045867b2c3c0940da5d4ad9241facadd2a30d71 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Tue, 10 Mar 2020 10:09:32 +0200
Subject: [PATCH 330/388] Don't touch tab indentations, they are there for a
 good reason

---
 .pre-commit-config.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4fa61012..51e4318d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,7 +23,3 @@ repos:
     hooks:
       # - id: forbid-crlf
       - id: remove-crlf
-      # - id: forbid-tabs
-      - id: remove-tabs
-        args: [--whitespaces-count, '2']  # defaults to: 4
-        exclude: .gitmodules

From b14a38fec953e3d1558b6f095c9f588c1c5c1012 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 21 Jun 2020 16:01:05 +0300
Subject: [PATCH 331/388] ci: Add pre-commit run and remove trailling spaces

---
 .travis.yml                | 26 +++++++++++++++++++++++---
 test/lint-requirements.txt |  1 +
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 test/lint-requirements.txt

diff --git a/.travis.yml b/.travis.yml
index 12d5e15e..68624bc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,19 +12,39 @@ os: linux
 
 dist: xenial
 
+cache:
+  directories:
+  - "${HOME}/.cache/pip"
+  - "${HOME}/.cache/pre-commit"
+  - "${HOME}/.pre-commit-venv"
+  - "${HOME}/bin"
+  - /usr/lib/python3.8
+
 jobs:
+  include:
+  - language: go
+    go: "1.14"
+    name: Ubuntu 18.04
+    dist: bionic
+    sudo: required
+    before_script:
+      GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt;
+      curl https://pre-commit.com/install-local.py | python3 -
+    script:
+      SKIP=shellcheck pre-commit run --all-files;
+
   - <<: *native_job
     name: Ubuntu 16.04
-  
+
   - <<: *native_job
     name: Ubuntu 18.04
     dist: bionic
-    
+
   - <<: *native_job
     name: MacOS xcode9.4
     os: osx
     osx_image: xcode9.4 # Default xcode on Travis.
-    
+
   - <<: *native_job
     name: MacOS xcode11.5
     os: osx
diff --git a/test/lint-requirements.txt b/test/lint-requirements.txt
new file mode 100644
index 00000000..72224bf8
--- /dev/null
+++ b/test/lint-requirements.txt
@@ -0,0 +1 @@
+pre-commit==2.3.0

From 45d076567a13635f5a266261fca384801d5af22d Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 21 Jun 2020 21:32:46 +0300
Subject: [PATCH 332/388] Add simple shellcheckrc

---
 .shellcheckrc | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .shellcheckrc

diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 00000000..6418bd8f
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1,6 @@
+# We use colors and not assigned
+disable=SC2154
+# Hard to fix
+disable=SC2155
+# shellcheck is wrong on some
+disable=SC2034

From 2acf26b7b3c1b976e7f9ecac9dd2793f67836f55 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Tue, 13 Oct 2020 17:20:11 +0300
Subject: [PATCH 333/388] pre-commit: Do not run shfmt/shellcheck on .bats
 files

---
 .pre-commit-config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 51e4318d..696fabf4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,7 +17,9 @@ repos:
     hooks:
       - id: git-check  # Configure in .gitattributes
       - id: shellcheck
+        exclude: ".bats$"
       - id: shfmt
+        exclude: ".bats$"
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.1.7
     hooks:

From d150fc6ec18ef8b81fd781ef9bc75646675ce4a5 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 15 Oct 2020 23:49:52 +0300
Subject: [PATCH 334/388] ci: Run pre-commit only on whitelisted files

---
 .travis.yml     | 2 +-
 clean_files.txt | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 clean_files.txt

diff --git a/.travis.yml b/.travis.yml
index 68624bc8..535709c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ jobs:
       GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt;
       curl https://pre-commit.com/install-local.py | python3 -
     script:
-      SKIP=shellcheck pre-commit run --all-files;
+      pre-commit run --files `cat clean_files.txt`;
 
   - <<: *native_job
     name: Ubuntu 16.04
diff --git a/clean_files.txt b/clean_files.txt
new file mode 100644
index 00000000..e69de29b

From c42e3e8b211d63ac3028bd1fc62342a9c3386d80 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Tue, 10 Mar 2020 10:16:02 +0200
Subject: [PATCH 335/388] Removed trailing whitespaces

---
 aliases/available/clipboard.aliases.bash      |  2 +-
 completion/available/gem.completion.bash      |  4 +-
 completion/available/git_flow.completion.bash | 40 ++++++------
 completion/available/jboss7.completion.bash   | 40 ++++++------
 completion/available/laravel.completion.bash  |  3 +-
 completion/available/salt.completion.bash     | 61 +++++++++----------
 completion/available/sqlmap.completion.bash   |  8 +--
 completion/available/ssh.completion.bash      |  4 +-
 completion/available/virsh.completion.bash    |  4 +-
 .../available/virtualbox.completion.bash      | 28 ++++-----
 completion/available/vuejs.completion.bash    |  2 +-
 completion/available/wpscan.completion.bash   |  3 +-
 plugins/available/autojump.plugin.bash        |  2 +-
 plugins/available/git.plugin.bash             |  4 +-
 plugins/available/postgres.plugin.bash        | 11 ++--
 plugins/available/powerline.plugin.bash       |  2 +-
 themes/atomic/atomic.theme.bash               | 16 ++---
 themes/barbuk/README.md                       |  2 +-
 themes/codeword/README.md                     |  2 +-
 themes/essential/essential.theme.bash         |  2 +-
 themes/hawaii50/hawaii50.theme.bash           | 16 ++---
 themes/n0qorg/n0qorg.theme.bash               |  2 +-
 themes/parrot/parrot.theme.bash               |  2 +-
 themes/powerline-multiline/README.md          |  2 +-
 themes/pure/pure.theme.bash                   | 10 +--
 themes/ramses/ramses.theme.bash               |  6 +-
 themes/sirup/sirup.theme.bash                 |  2 +-
 themes/zork/zork.theme.bash                   |  6 +-
 28 files changed, 140 insertions(+), 146 deletions(-)

diff --git a/aliases/available/clipboard.aliases.bash b/aliases/available/clipboard.aliases.bash
index 528e2d0e..c6c15519 100644
--- a/aliases/available/clipboard.aliases.bash
+++ b/aliases/available/clipboard.aliases.bash
@@ -7,7 +7,7 @@ case $OSTYPE in
     [[ $XCLIP ]] && \
     alias pbcopy="$XCLIP -selection clipboard" && \
     alias pbpaste="$XCLIP -selection clipboard -o"
-    ;;   
+    ;;
 esac
 
 # to use it just install xclip on your distribution and it would work like:
diff --git a/completion/available/gem.completion.bash b/completion/available/gem.completion.bash
index de986e08..2d098529 100644
--- a/completion/available/gem.completion.bash
+++ b/completion/available/gem.completion.bash
@@ -6,7 +6,7 @@ _installcomp() {
   then
     REMOTE_GEMS=( $(gem list --remote --no-versions | tr '\n' ' ') )
   fi
-  
+
   local cur=${COMP_WORDS[COMP_CWORD]}
   COMPREPLY=( $(compgen -W "${REMOTE_GEMS[*]}" -- $cur) )
 }
@@ -16,7 +16,7 @@ _uninstallcomp() {
   then
     LOCAL_GEMS=( $(gem list --no-versions | sed 's/\*\*\* LOCAL GEMS \*\*\*//' | tr '\n' ' ') )
   fi
-  
+
   local cur=${COMP_WORDS[COMP_CWORD]}
   COMPREPLY=( $(compgen -W "${LOCAL_GEMS[*]}" -- $cur) )
 }
diff --git a/completion/available/git_flow.completion.bash b/completion/available/git_flow.completion.bash
index c76d323b..04f20ccd 100644
--- a/completion/available/git_flow.completion.bash
+++ b/completion/available/git_flow.completion.bash
@@ -2,47 +2,47 @@
 #
 # git-flow-completion
 # ===================
-# 
+#
 # Bash completion support for [git-flow](http://github.com/nvie/gitflow)
-# 
+#
 # The contained completion routines provide support for completing:
-# 
+#
 #  * git-flow init and version
 #  * feature, hotfix and release branches
 #  * remote feature branch names (for `git-flow feature track`)
-# 
-# 
+#
+#
 # Installation
 # ------------
-# 
+#
 # To achieve git-flow completion nirvana:
-# 
+#
 #  0. Install git-completion.
-# 
+#
 #  1. Install this file. Either:
-# 
+#
 #     a. Place it in a `bash-completion.d` folder:
-# 
+#
 #        * /etc/bash-completion.d
 #        * /usr/local/etc/bash-completion.d
 #        * ~/bash-completion.d
-# 
+#
 #     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.sh) and put the following line in
 #        your .bashrc:
-# 
+#
 #            source ~/.git-flow-completion.sh
-# 
+#
 #  2. If you are using Git < 1.7.1: Edit git-completion.sh and add the following line to the giant
 #     $command case in _git:
-# 
+#
 #         flow)        _git_flow ;;
-# 
-# 
+#
+#
 # The Fine Print
 # --------------
-# 
+#
 # Copyright (c) 2010 [Justin Hileman](http://justinhileman.com)
-# 
+#
 # Distributed under the [MIT License](http://creativecommons.org/licenses/MIT/)
 
 _git_flow ()
@@ -128,7 +128,7 @@ __git_flow_release ()
 		__gitcomp "$subcommands"
 		return
 	fi
-	
+
 	case "$subcommand" in
 	finish)
 		__gitcomp "$(__git_flow_list_releases)"
@@ -174,4 +174,4 @@ __git_flow_list_hotfixes ()
 # temporarily wrap __git_find_on_cmdline() for backwards compatibility
 if [ -z "`type -t __git_find_subcommand`" ]; then
 	alias __git_find_subcommand=__git_find_on_cmdline
-fi
\ No newline at end of file
+fi
diff --git a/completion/available/jboss7.completion.bash b/completion/available/jboss7.completion.bash
index 66d07179..0bb44f15 100644
--- a/completion/available/jboss7.completion.bash
+++ b/completion/available/jboss7.completion.bash
@@ -14,17 +14,17 @@ _serverProfiles(){
        # assume is domain.sh
       serverdir="../domain/configuration/"
     fi
-    
+
     for i in  ${!COMP_WORDS[*]}
     do
       if [[ "${COMP_WORDS[i]}" == "-Djboss.server.base.dir" || "${COMP_WORDS[i]}" == "-Djboss.domain.base.dir" ]]; then
         serverdir="${COMP_WORDS[i+2]}/configuration"
-      fi 
-      
+      fi
+
     done
     if [ -d "${serverdir}" ]
     then
- 
+
       IFS=$'\n' tmp="$(ls "${serverdir}" | grep xml)"
         local fls="${tmp[@]// /\ }"
       unset IFS
@@ -42,13 +42,13 @@ _bindingAddress(){
 }
 
 _jboss(){
-    
+
     local cur prev words cword
     COMPREPLY=()
     _get_comp_words_by_ref -n = cur prev words cword
-  
+
     case $cur in
-	
+
         -Djboss.socket.binding.port-offset=*)
             cur=${cur#*=}
             #static list of common bindings sets
@@ -70,13 +70,13 @@ _jboss(){
             COMPREPLY=( $(compgen -W "${booleans}" -- ${cur}) )
             return 0
             ;;
-        
+
         -Djboss.server.base.dir=*|-Djboss.home.dir=*|-Djboss.domain.base.dir=*)
            cur=${cur#*=}
            _filedir -d
            return 0
            ;;
-         
+
         -Djboss.domain.master.address=*|-Djboss.bind.address*=*)
            cur=${cur#*=}
            _bindingAddress
@@ -85,8 +85,8 @@ _jboss(){
         --server-config=*|-c=|--host-config=*)
 	   cur=${cur#*=}
            _serverProfiles
-           return 0 
-     
+           return 0
+
 
     esac
 
@@ -110,14 +110,14 @@ _jboss(){
             ;;
     esac
     # *** from jboss5  ********************
-    # *** -modulepath  -c -m  -g -l -d -p -n -B -L -C  -Djboss.platform.mbeanserver -Djboss.server.base.directory   
+    # *** -modulepath  -c -m  -g -l -d -p -n -B -L -C  -Djboss.platform.mbeanserver -Djboss.server.base.directory
     # ***  -Djboss.Domain -Djboss.modcluster.proxyList  -Djboss.jvmRoute -Djboss.default.jgroups.stack -Dorg.jboss.ejb3.remoting.IsLocalInterceptor.passByRef -Djboss.platform.mbeanserver -Dcom.sun.management.jmxremote.port -Dcom.sun.management.jmxremote.ssl
     # *************************************
-    
+
     # standard commands for standalone and domain mode
     local commandsWithoutEqualSign='-b -bmanagement -bunsecure -bpublic --admin-only -h -help -u -version -V -v'
     local commandsWithEqualSign='-P -Djboss.node.name -Djboss.home.dir -Djboss.socket.binding.port-offset -Djboss.bind.address.management -Djboss.bind.address -Djboss.bind.address.unsecure'
-    
+
     if [[ $COMP_WORDS == *standalone.sh* ]]
     then
        commandsWithoutEqualSign="${commandsWithoutEqualSign} -c"
@@ -127,15 +127,15 @@ _jboss(){
        commandsWithoutEqualSign="${commandsWithoutEqualSign} --backup  --cached-dc"
        commandsWithEqualSign="${commandsWithEqualSign} -Djboss.domain.master.address --host-config -Djboss.domain.master.port -Djboss.domain.base.dir "
     fi
-     
 
-    
-    
-    COMPREPLY=( $( compgen -W "$commandsWithoutEqualSign" -- "$cur" ) 
-                $( compgen -W "$commandsWithEqualSign"  -S '=' -- "$cur" ) )       
+
+
+
+    COMPREPLY=( $( compgen -W "$commandsWithoutEqualSign" -- "$cur" )
+                $( compgen -W "$commandsWithEqualSign"  -S '=' -- "$cur" ) )
     return 0
 
-  
+
 }
 complete -o nospace -F _jboss standalone.sh
 complete -o nospace -F _jboss domain.sh
diff --git a/completion/available/laravel.completion.bash b/completion/available/laravel.completion.bash
index bf24f67e..7bd6f223 100644
--- a/completion/available/laravel.completion.bash
+++ b/completion/available/laravel.completion.bash
@@ -10,7 +10,6 @@ if command -v laravel > /dev/null; then
             fi
         done
     }
-    
+
     complete -F __laravel_completion laravel
 fi
-
diff --git a/completion/available/salt.completion.bash b/completion/available/salt.completion.bash
index e8cb5b25..7634dcdc 100644
--- a/completion/available/salt.completion.bash
+++ b/completion/available/salt.completion.bash
@@ -13,7 +13,7 @@
 
 
 _salt_get_grains(){
-    if [ "$1" = 'local' ] ; then 
+    if [ "$1" = 'local' ] ; then
         salt-call --out=txt -- grains.ls | sed  's/^.*\[//' | tr -d ",']" |sed 's:\([a-z0-9]\) :\1\: :g'
     else
       salt '*' --timeout 2 --out=txt -- grains.ls | sed  's/^.*\[//' | tr -d ",']" |sed 's:\([a-z0-9]\) :\1\: :g'
@@ -22,15 +22,15 @@ _salt_get_grains(){
 
 _salt_get_grain_values(){
     if [ "$1" = 'local' ] ; then
-        salt-call --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$' 
+        salt-call --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$'
     else
-        salt '*' --timeout 2 --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$' 
+        salt '*' --timeout 2 --out=txt -- grains.item $1 |sed 's/^\S*:\s//' |grep -v '^\s*$'
     fi
 }
 
 
 _salt(){
-    local cur prev opts _salt_grains _salt_coms pprev ppprev 
+    local cur prev opts _salt_grains _salt_coms pprev ppprev
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
@@ -58,11 +58,11 @@ _salt(){
     case "${pprev}" in
     -G|--grain|--grain-pcre)
     if [ "${cur}" = ":" ]; then
-        COMPREPLY=($(compgen -W "`_salt_get_grain_values ${prev}`"  ))	
+        COMPREPLY=($(compgen -W "`_salt_get_grain_values ${prev}`"  ))
         return 0
     fi
     ;;
-    esac 
+    esac
     case "${ppprev}" in
     -G|--grain|--grain-pcre)
         if [ "${prev}" = ":" ]; then
@@ -70,17 +70,17 @@ _salt(){
         return 0
         fi
     ;;
-    esac  
- 
+    esac
+
     if [ "${cur}" = "=" ] && [[ "${prev}" == --* ]]; then
-       cur="" 
+       cur=""
     fi
     if [ "${prev}" = "=" ] && [[ "${pprev}" == --* ]]; then
        prev="${pprev}"
     fi
- 
+
    case "${prev}" in
- 
+
      -c|--config)
         COMPREPLY=($(compgen -f -- ${cur}))
         return 0
@@ -89,12 +89,12 @@ _salt(){
         COMPREPLY=($(compgen -W "\'*\' ${opts} `salt-key --no-color -l acc`" -- ${cur}))
         return 0
         ;;
-     -E|--pcre) 
+     -E|--pcre)
         COMPREPLY=($(compgen -W "`salt-key --no-color -l acc`" -- ${cur}))
         return 0
         ;;
      -G|--grain|--grain-pcre)
-        COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur})) 
+        COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
         return 0
 	;;
      -C|--compound)
@@ -109,10 +109,10 @@ _salt(){
         COMPREPLY=($(compgen -W "1 2 3 4 5 6 7 8 9 10 15 20 30 40 50 60 70 80 90 100 120 150 200"))
         return 0
         ;;
-     -N|--nodegroup)  
+     -N|--nodegroup)
 	    MASTER_CONFIG='/etc/salt/master'
-        COMPREPLY=($(compgen -W "`awk -F ':'  'BEGIN {print_line = 0};  /^nodegroups/ {print_line = 1;getline } print_line && /^  */ {print $1} /^[^ ]/ {print_line = 0}' <${MASTER_CONFIG}`" -- ${cur})) 
-        return 0  
+        COMPREPLY=($(compgen -W "`awk -F ':'  'BEGIN {print_line = 0};  /^nodegroups/ {print_line = 1;getline } print_line && /^  */ {print $1} /^[^ ]/ {print_line = 0}' <${MASTER_CONFIG}`" -- ${cur}))
+        return 0
      ;;
     esac
 
@@ -133,8 +133,8 @@ _saltkey(){
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     opts="-c --config-dir= -h --help --version --versions-report -q --quiet \
           -y --yes --gen-keys= --gen-keys-dir= --keysize= --key-logfile= \
-          -l --list= -L --list-all -a --accept= -A --accept-all \ 
-          -r --reject= -R --reject-all -p --print= -P --print-all \ 
+          -l --list= -L --list-all -a --accept= -A --accept-all \
+          -r --reject= -R --reject-all -p --print= -P --print-all \
           -d --delete= -D --delete-all -f --finger= -F --finger-all \
           --out=pprint --out=yaml --out=overstatestage --out=json --out=raw \
           --out=highstate --out=key --out=txt --no-color --out-indent= "
@@ -150,13 +150,13 @@ _saltkey(){
     fi
 
     if [ "${cur}" = "=" ] && [[ "${prev}" == --* ]]; then
-       cur="" 
+       cur=""
     fi
     if [ "${prev}" = "=" ] && [[ "${pprev}" == --* ]]; then
        prev="${pprev}"
     fi
 
-    case "${prev}" in 
+    case "${prev}" in
      -a|--accept)
         COMPREPLY=($(compgen -W "$(salt-key -l un --no-color; salt-key -l rej --no-color)" -- ${cur}))
         return 0
@@ -177,7 +177,7 @@ _saltkey(){
         COMPREPLY=($(compgen -W "2048 3072 4096 5120 6144" -- ${cur}))
         return 0
         ;;
-     --gen-keys) 
+     --gen-keys)
         return 0
         ;;
      --gen-keys-dir)
@@ -221,14 +221,14 @@ _saltcall(){
         COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
         return 0
     fi
-    
+
     if [ "${cur}" = "=" ] && [[ ${prev} == --* ]]; then
        cur=""
     fi
     if [ "${prev}" = "=" ] && [[ ${pprev} == --* ]]; then
        prev="${pprev}"
     fi
-    
+
     case ${prev} in
         -m|--module-dirs)
                 COMPREPLY=( $(compgen -d ${cur} ))
@@ -262,7 +262,7 @@ _saltcp(){
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     opts="-t --timeout= -s --static -b --batch= --batch-size= \
           -h --help --version --versions-report -c --config-dir= \
-          -E --pcre -L --list -G --grain --grain-pcre -N --nodegroup \ 
+          -E --pcre -L --list -G --grain --grain-pcre -N --nodegroup \
           -R --range -C --compound -I --pillar \
           --out=pprint --out=yaml --out=overstatestage --out=json --out=raw \
           --out=highstate --out=key --out=txt --no-color --out-indent= "
@@ -270,19 +270,19 @@ _saltcp(){
         COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
         return 0
     fi
-    
+
     if [ "${cur}" = "=" ] && [[ "${prev}" == --* ]]; then
-       cur="" 
+       cur=""
     fi
     if [ "${prev}" = "=" ] && [[ "${pprev}" == --* ]]; then
        prev=${pprev}
     fi
-    
+
     case ${prev} in
  	salt-cp)
 	    COMPREPLY=($(compgen -W "${opts} `salt-key -l acc --no-color`" -- ${cur}))
 	    return 0
-	;;       
+	;;
         -t|--timeout)
 	    # those numbers are just a hint
             COMPREPLY=($(compgen -W "2 3 4 8 10 15 20 25 30 40 60 90 120 180 240 300" -- ${cur} ))
@@ -303,7 +303,7 @@ _saltcp(){
 	    return 0
 	;;
 	-G|--grain|--grain-pcre)
-            COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur})) 
+            COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
             return 0
 	    ;;
 	    # FIXME
@@ -320,10 +320,9 @@ _saltcp(){
 	    return 0
 	;;
     esac
-   
+
    # default is using opts:
    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 }
 
 complete -F _saltcp salt-cp
-
diff --git a/completion/available/sqlmap.completion.bash b/completion/available/sqlmap.completion.bash
index e80eb796..16addf85 100644
--- a/completion/available/sqlmap.completion.bash
+++ b/completion/available/sqlmap.completion.bash
@@ -4,7 +4,7 @@
 #                                                                            |
 # Thanks to Alexander Korznikov                                                                 |
 # http://www.korznikov.com/2014/12/bash-tab-completion-for-awesome-tool.html |
-#                                                                            |        
+#                                                                            |
 # ---------------------------------------------------------------------------+
 
 if command -v sqlmap > /dev/null; then
@@ -18,7 +18,7 @@ if command -v sqlmap > /dev/null; then
         prev=$(_get_pword)
 
         case $prev in
-        
+
     # List directory content
     --tamper)
         COMPREPLY=( $( compgen -W "$tamper" -- "$cur" ) )
@@ -108,7 +108,7 @@ if command -v sqlmap > /dev/null; then
         -z --alert --answers --beep --check-waf --cleanup \
         --dependencies --disable-coloring --gpage --identify-waf \
         --mobile --page-rank --purge-output --smart \
-        --sqlmap-shell --wizard' -- "$cur" ) )     
+        --sqlmap-shell --wizard' -- "$cur" ) )
         # this removes any options from the list of completions that have
         # already been specified somewhere on the command line, as long as
         # these options can only be used once (in a word, "options", in
@@ -155,7 +155,7 @@ if command -v sqlmap > /dev/null; then
                 done
                 printf '%s ' "${COMPREPLY[@]}") <<<"${COMP_WORDS[@]}"
             ) )
-        
+
     #    else
     #        _filedir bat
         fi
diff --git a/completion/available/ssh.completion.bash b/completion/available/ssh.completion.bash
index 0e066091..1f71f112 100644
--- a/completion/available/ssh.completion.bash
+++ b/completion/available/ssh.completion.bash
@@ -13,8 +13,8 @@ _sshcomplete() {
 
     # parse all defined hosts from .ssh/config and files included there
     for fl in "$HOME/.ssh/config" \
-        $(grep "^\s*Include" "$HOME/.ssh/config" | 
-            awk '{for (i=2; i<=NF; i++) print $i}' | 
+        $(grep "^\s*Include" "$HOME/.ssh/config" |
+            awk '{for (i=2; i<=NF; i++) print $i}' |
             sed -Ee "s|^([^/~])|$HOME/.ssh/\1|" -e "s|^~/|$HOME/|")
     do
         if [ -r "$fl" ]; then
diff --git a/completion/available/virsh.completion.bash b/completion/available/virsh.completion.bash
index 14f03d73..4090a24a 100644
--- a/completion/available/virsh.completion.bash
+++ b/completion/available/virsh.completion.bash
@@ -10,7 +10,7 @@ _contain_cmd()
 {
     local e f
     local array1=($1) array2=($2)
-    
+
     for e in "${array1[@]}"
     do
         for f in "${array2[@]}"
@@ -80,7 +80,7 @@ _virsh_list_nwfilters()
     virsh -q nwfilter-list | cut -d\  -f4 | awk '{print $1}'
 }
 
-_virsh() 
+_virsh()
 {
     local cur prev cmds doms options nets pools cmds_help
     local flag_all=1 array ret a b ifaces nwfilters files
diff --git a/completion/available/virtualbox.completion.bash b/completion/available/virtualbox.completion.bash
index 56e0e673..d0d41df2 100644
--- a/completion/available/virtualbox.completion.bash
+++ b/completion/available/virtualbox.completion.bash
@@ -23,16 +23,16 @@ __vboxmanage_startvm() {
 
 __vboxmanage_list() {
     INPUT=$(vboxmanage list | tr -s '[\[\]\|\n]' ' ' | cut -d' ' -f4-)
-    
+
     PRUNED=""
     if [ "$1" == "long" ]; then
 	for WORD in $INPUT; do
 	    [ "$WORD" == "-l" ] && continue;
 	    [ "$WORD" == "--long" ] && continue;
-	    
+
 	    PRUNED="$PRUNED $WORD"
 	done
-    else 
+    else
 	PRUNED=$INPUT
     fi
 
@@ -47,7 +47,7 @@ __vboxmanage_list_vms() {
     else
 	SEPARATOR=$1
     fi
-    
+
     for VM in $(vboxmanage list vms | cut -d' ' -f1 | tr -d '"'); do
 	[ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}"
 	VMS="${VMS}${VM}"
@@ -63,7 +63,7 @@ __vboxmanage_list_runningvms() {
     else
 	SEPARATOR=$1
     fi
-    
+
     for VM in $(vboxmanage list runningvms | cut -d' ' -f1 | tr -d '"'); do
 	[ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}"
 	VMS="${VMS}${VM}"
@@ -81,7 +81,7 @@ __vboxmanage_controlvm() {
     echo "screenshotpng setcredentials teleport plugcpu unplugcpu"
     echo "cpuexecutioncap"
 
-# setlinkstate<1-N> 
+# setlinkstate<1-N>
 # nic<1-N> null|nat|bridged|intnet|hostonly|generic
 #                                      [<devicename>] |
                           # nictrace<1-N> on|off
@@ -136,9 +136,9 @@ __vboxmanage_default() {
 	done
 	(( $MATCH == 1 )) && continue;
 	pruned="$pruned $WORD"
-	
+
     done
-    
+
     # COMPREPLY=($(compgen -W "${pruned}" -- ${cur}))
     echo $pruned
     return 0
@@ -156,13 +156,13 @@ _vboxmanage() {
 
     # In case current is complete command
     case $cur in
-	startvm|list|controlvm)	    
+	startvm|list|controlvm)
 	    COMPREPLY=($(compgen -W "$cur "))
 	    return 0
 	    ;;
     esac
 
-    case $prev in 
+    case $prev in
 	-v|--version)
 	    return 0
 	    ;;
@@ -170,13 +170,13 @@ _vboxmanage() {
 	-l|--long)
 	    opts=$(__vboxmanage_list "long")
 	    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	    return 0	    
+	    return 0
 	    ;;
 	startvm|list)
 	    opts=$(__vboxmanage_$prev)
 	    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	    return 0	    
-	    ;;	
+	    return 0
+	    ;;
 	--type)
 	    COMPREPLY=($(compgen -W "gui headless" -- ${cur}))
 	    return 0
@@ -204,7 +204,7 @@ _vboxmanage() {
 	    # echo "previous: $pprev"
 	    case $pprev in
 		startvm)
- 		    opts="--type"	    
+ 		    opts="--type"
 		    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
 		    return 0
 		    ;;
diff --git a/completion/available/vuejs.completion.bash b/completion/available/vuejs.completion.bash
index 2959f29b..69794785 100644
--- a/completion/available/vuejs.completion.bash
+++ b/completion/available/vuejs.completion.bash
@@ -10,6 +10,6 @@ if command -v vue > /dev/null; then
             fi
         done
     }
-    
+
     complete -F __vuejs_completion vue
 fi
diff --git a/completion/available/wpscan.completion.bash b/completion/available/wpscan.completion.bash
index 3630183e..f9ea5790 100644
--- a/completion/available/wpscan.completion.bash
+++ b/completion/available/wpscan.completion.bash
@@ -10,7 +10,6 @@ if command -v wpscan > /dev/null; then
             fi
         done
     }
-    
+
     complete -F __wpscan_completion wpscan
 fi
-
diff --git a/plugins/available/autojump.plugin.bash b/plugins/available/autojump.plugin.bash
index a050ace2..345ecadb 100644
--- a/plugins/available/autojump.plugin.bash
+++ b/plugins/available/autojump.plugin.bash
@@ -8,5 +8,5 @@ if command -v brew &>/dev/null && [[ -s $(brew --prefix)/etc/profile.d/autojump.
 elif command -v dpkg &>/dev/null && dpkg -s autojump &>/dev/null ; then
   . "$(dpkg-query -S autojump.sh | cut -d' ' -f2)"
 elif command -v pacman &>/dev/null && pacman -Q autojump &>/dev/null ; then
-  . "$(pacman -Ql autojump | grep autojump.sh | cut -d' ' -f2)"  
+  . "$(pacman -Ql autojump | grep autojump.sh | cut -d' ' -f2)"
 fi
diff --git a/plugins/available/git.plugin.bash b/plugins/available/git.plugin.bash
index d5aa6d8f..b2c05b60 100644
--- a/plugins/available/git.plugin.bash
+++ b/plugins/available/git.plugin.bash
@@ -227,7 +227,7 @@ function gitignore-reload() {
   example '$ gitignore-reload'
 
     # The .gitignore file should not be reloaded if there are uncommited changes.
-  # Firstly, require a clean work tree. The function require_clean_work_tree() 
+  # Firstly, require a clean work tree. The function require_clean_work_tree()
   # was stolen with love from https://www.spinics.net/lists/git/msg142043.html
 
   # Begin require_clean_work_tree()
@@ -273,5 +273,3 @@ function gitignore-reload() {
     echo >&2 "Files readded. Commit your new changes now."
   fi
 }
-
-
diff --git a/plugins/available/postgres.plugin.bash b/plugins/available/postgres.plugin.bash
index e481d734..8f239985 100644
--- a/plugins/available/postgres.plugin.bash
+++ b/plugins/available/postgres.plugin.bash
@@ -11,7 +11,7 @@ do
    if [ -f "$possible/pg_hba.conf" ]
    then
        # echo "PGDATA: $possible"
-       export PGDATA=$possible    
+       export PGDATA=$possible
    fi
 done
 
@@ -23,7 +23,7 @@ function postgres_start {
   about 'Starts PostgreSQL server'
   group 'postgres'
 
-  echo 'Starting Postgres....'; 
+  echo 'Starting Postgres....';
   $POSTGRES_BIN/pg_ctl -D $PGDATA -l $PGDATA/logfile  start
 }
 
@@ -31,7 +31,7 @@ function postgres_stop {
   about 'Stops PostgreSQL server'
   group 'postgres'
 
-  echo 'Stopping Postgres....'; 
+  echo 'Stopping Postgres....';
   $POSTGRES_BIN/pg_ctl -D $PGDATA -l $PGDATA/logfile stop -s -m fast
 }
 
@@ -39,7 +39,7 @@ function postgres_status {
   about 'Returns status of PostgreSQL server'
   group 'postgres'
 
-  # $POSTGRES_BIN/pg_ctl -D $PGDATA status  
+  # $POSTGRES_BIN/pg_ctl -D $PGDATA status
   if [[ $(is_postgres_running) == "no server running" ]]
   then
     echo "Postgres service [STOPPED]"
@@ -58,7 +58,7 @@ function postgres_restart {
   about 'Restarts status of PostgreSQL server'
   group 'postgres'
 
-  echo 'Restarting Postgres....'; 
+  echo 'Restarting Postgres....';
   $POSTGRES_BIN/pg_ctl -D $PGDATA restart
 }
 
@@ -84,4 +84,3 @@ function postgres_serverlog {
 #   tail -500 $PGDATA/pg_log/`ls -Art $PGDATA/pg_log | tail -n 1` | less
 # }
 #
-
diff --git a/plugins/available/powerline.plugin.bash b/plugins/available/powerline.plugin.bash
index 0388aa37..3d91e658 100644
--- a/plugins/available/powerline.plugin.bash
+++ b/plugins/available/powerline.plugin.bash
@@ -22,5 +22,5 @@ bashPowerlineInit=$(python -c \
 	'bindings', \
 	'bash', \
 	'powerline.sh'))")
-[ -e $bashPowerlineInit ] || return 
+[ -e $bashPowerlineInit ] || return
 . $bashPowerlineInit
diff --git a/themes/atomic/atomic.theme.bash b/themes/atomic/atomic.theme.bash
index 5f44b34b..5035d49f 100644
--- a/themes/atomic/atomic.theme.bash
+++ b/themes/atomic/atomic.theme.bash
@@ -73,24 +73,24 @@ ____atomic_top() {
   _TOP_RIGHT=""
   __TOP_RIGHT_LEN=0
   __SEG_AT_RIGHT=0
-  
+
   for seg in ${___ATOMIC_TOP_LEFT}; do
     info="$(___atomic_prompt_"${seg}")"
     [ -n "${info}" ] && ____atomic_top_left_parse "${info}"
   done
-  
+
   ___cursor_right="\e[500C"
   _TOP_LEFT+="${___cursor_right}"
-  
+
   for seg in ${___ATOMIC_TOP_RIGHT}; do
     info="$(___atomic_prompt_"${seg}")"
     [ -n "${info}" ] && ____atomic_top_right_parse "${info}"
   done
-  
+
   [ $__TOP_RIGHT_LEN -gt 0 ] && __TOP_RIGHT_LEN=$(( __TOP_RIGHT_LEN - 0 ))
   ___cursor_adjust="\e[${__TOP_RIGHT_LEN}D"
   _TOP_LEFT+="${___cursor_adjust}"
-  
+
   printf "%s%s" "${_TOP_LEFT}" "${_TOP_RIGHT}"
 }
 
@@ -111,7 +111,7 @@ ___atomic_prompt_user_info() {
   color=$white
   box="${normal}${LineA}\$([[ \$? != 0 ]] && echo \"${BIWhite}[${IRed}${SX}${BIWhite}]${normal}${Line}\")${Line}${BIWhite}[|${BIWhite}]${normal}${Line}"
   info="${IYellow}\u${IRed}@${IGreen}\h"
-  
+
   printf "%s|%s|%s|%s" "${color}" "${info}" "${white}" "${box}"
 }
 
@@ -234,7 +234,7 @@ _atomic_completion() {
       return 0
     ;;
   esac
-  
+
   COMPREPLY=( $(compgen -W "${actions}" -- "${cur}") )
   return 0
 }
@@ -312,7 +312,7 @@ __atomic_ps2() {
 
 _atomic_prompt() {
   exitcode="$?"
-  
+
   PS1="$(__atomic_ps1)"
   PS2="$(__atomic_ps2)"
 }
diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index fdc60719..cfff155f 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -84,7 +84,7 @@ chmod 400 /etc/sudoers.d/keepenv
 ### Clean
 
 ```bash
- ~ ❯ 
+ ~ ❯
 ```
 
 ### Git
diff --git a/themes/codeword/README.md b/themes/codeword/README.md
index 38201dbf..c0cb8944 100644
--- a/themes/codeword/README.md
+++ b/themes/codeword/README.md
@@ -4,7 +4,7 @@
 Minimal theme overrides from bash_it base theming
 
 
-## `user@host:path[virt-env][scm] $` 
+## `user@host:path[virt-env][scm] $`
 Breakdown of the segments:
 
 - **user@host:path** - *convienient for LAN based `ssh` and `scp` tasks*
diff --git a/themes/essential/essential.theme.bash b/themes/essential/essential.theme.bash
index c0b1a38e..ae988733 100644
--- a/themes/essential/essential.theme.bash
+++ b/themes/essential/essential.theme.bash
@@ -54,7 +54,7 @@ function _exit-status-prompt() {
     local -r exit_status_color="${bold_red}"
   fi
 
-  echo -ne "${exit_status_color}" 
+  echo -ne "${exit_status_color}"
   if [[ "${prompt_string}" -eq 1 ]]; then
     # $PS1:
     echo -e " +${normal} "
diff --git a/themes/hawaii50/hawaii50.theme.bash b/themes/hawaii50/hawaii50.theme.bash
index eaa6b1eb..404088d9 100644
--- a/themes/hawaii50/hawaii50.theme.bash
+++ b/themes/hawaii50/hawaii50.theme.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# This theme was obviously inspired a lot by 
+# This theme was obviously inspired a lot by
 #
 # - Demula theme
 #
@@ -17,8 +17,8 @@
 # - configurable directory length
 # - hg, svn, git detection (I work in all of them)
 # - virtualenv, rvm + gemsets
-# 
-# Screenshot: http://i.imgur.com/4IAMJ.png 
+#
+# Screenshot: http://i.imgur.com/4IAMJ.png
 #
 # by Ryan Kanno <ryankanno@localkinegrinds.com>
 #
@@ -26,7 +26,7 @@
 #
 # Note: I also am really new to this bash scripting game, so if you see things
 # that are flat out wrong, or if you think of something neat, just send a pull
-# request.  This probably only works on a Mac - as some functions are OS 
+# request.  This probably only works on a Mac - as some functions are OS
 # specific like getting ip, etc.
 #
 
@@ -88,11 +88,11 @@ function get_ip_info {
     echo -e "$(ips | sed -e :a -e '$!N;s/\n/${IP_SEPARATOR}/;ta' | sed -e 's/127\.0\.0\.1\${IP_SEPARATOR}//g'), ${myip}"
 }
 
-# Displays ip prompt 
+# Displays ip prompt
 function ip_prompt_info() {
     if [[ $IP_ENABLED == 1 ]]; then
         echo -e " ${DEFAULT_COLOR}(${IP_COLOR}$(get_ip_info)${DEFAULT_COLOR})"
-    fi 
+    fi
 }
 
 # Displays virtual info prompt (virtualenv/rvm)
@@ -165,10 +165,10 @@ function svn_prompt_info() {
     echo -e "$prefix${REF_COLOR}$ref${DEFAULT_COLOR}:$revision$state$suffix"
 }
 
-# Displays last X characters of pwd 
+# Displays last X characters of pwd
 function limited_pwd() {
 
-    # Replace $HOME with ~ if possible 
+    # Replace $HOME with ~ if possible
     RELATIVE_PWD=${PWD/#$HOME/\~}
 
     local offset=$((${#RELATIVE_PWD}-$MAX_PWD_LENGTH))
diff --git a/themes/n0qorg/n0qorg.theme.bash b/themes/n0qorg/n0qorg.theme.bash
index 291e4518..12952913 100644
--- a/themes/n0qorg/n0qorg.theme.bash
+++ b/themes/n0qorg/n0qorg.theme.bash
@@ -19,7 +19,7 @@ GIT_THEME_PROMPT_PREFIX="${bold_blue}(${bold_white}"
 GIT_THEME_PROMPT_SUFFIX="${bold_blue})"
 
 ## alternate chars
-# 
+#
 SCM_THEME_PROMPT_DIRTY="*"
 SCM_THEME_PROMPT_CLEAN=""
 SCM_THEME_PROMPT_PREFIX="("
diff --git a/themes/parrot/parrot.theme.bash b/themes/parrot/parrot.theme.bash
index afc8dd53..815aa952 100644
--- a/themes/parrot/parrot.theme.bash
+++ b/themes/parrot/parrot.theme.bash
@@ -28,7 +28,7 @@ function prompt() {
 
     if [ "$color_prompt" = yes ]; then
         PS1="\[\033[0;31m\]\342\224\214\342\224\200\$([[ \$? != 0 ]] && echo \"[\[\033[0;31m\]\342\234\227\[\033[0;37m\]]\342\224\200\")[$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]root\[\033[01;33m\]@\[\033[01;96m\]\h'; else echo '\[\033[0;39m\]\u\[\033[01;33m\]@\[\033[01;96m\]\h'; fi)\[\033[0;31m\]]\342\224\200[\[\033[0;32m\]\w\[\033[0;31m\]]\n\[\033[0;31m\]\342\224\224\342\224\200\342\224\200\342\225\274 \[\033[0m\]\[\e[01;33m\]$(parse_git_branch) $\[\e[0m\] "
-        
+
     else
         PS1='┌──[\u@\h]─[\w]\n└──╼ $(parse_git_branch_no_color) $ '
     fi
diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index f4a1fab8..da66d4ef 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -66,7 +66,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
   and `conda` supported)
 * `ruby` - Current ruby version if using `rvm`
 * `node` - Current node version (only `nvm` is supported)
-* `scm` - Version control information, `git` 
+* `scm` - Version control information, `git`
 * `terraform` - Current terraform workspace
 * `user_info` - Current user
 * `wd` - Working directory, like `cwd` but doesn't show the full folder
diff --git a/themes/pure/pure.theme.bash b/themes/pure/pure.theme.bash
index c18e20b2..0be40b5a 100644
--- a/themes/pure/pure.theme.bash
+++ b/themes/pure/pure.theme.bash
@@ -17,13 +17,13 @@ VIRTUALENV_THEME_PROMPT_SUFFIX=")"
 # export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
 
 scm_prompt() {
-    CHAR=$(scm_char) 
-    if [ $CHAR = $SCM_NONE_CHAR ] 
-        then 
+    CHAR=$(scm_char)
+    if [ $CHAR = $SCM_NONE_CHAR ]
+        then
             return
-        else 
+        else
             echo "[$(scm_char)$(scm_prompt_info)]"
-    fi 
+    fi
 }
 
 pure_prompt() {
diff --git a/themes/ramses/ramses.theme.bash b/themes/ramses/ramses.theme.bash
index 83ab810f..7795cf75 100644
--- a/themes/ramses/ramses.theme.bash
+++ b/themes/ramses/ramses.theme.bash
@@ -49,7 +49,7 @@ modern_scm_prompt() {
 # show chroot if exist
 chroot(){
     if [ -n "$debian_chroot" ]
-    then 
+    then
         my_ps_chroot="${bold_cyan}$debian_chroot${normal}";
         echo "($my_ps_chroot)";
     fi
@@ -63,7 +63,7 @@ my_ve(){
         my_ps_ve="${bold_purple}${CONDA_DEFAULT_ENV}${normal}";
         echo "($my_ps_ve)";
     elif [ -n "$VIRTUAL_ENV" ]
-    then 
+    then
         my_ps_ve="${bold_purple}$ve${normal}";
         echo "($my_ps_ve)";
     fi
@@ -75,7 +75,7 @@ prompt() {
     my_ps_host="${green}\h${normal}";
     # yes, these are the the same for now ...
     my_ps_host_root="${green}\h${normal}";
- 
+
     my_ps_user="${bold_green}\u${normal}"
     my_ps_root="${bold_red}\u${normal}";
 
diff --git a/themes/sirup/sirup.theme.bash b/themes/sirup/sirup.theme.bash
index 38fcab41..235de018 100644
--- a/themes/sirup/sirup.theme.bash
+++ b/themes/sirup/sirup.theme.bash
@@ -13,7 +13,7 @@ function rvm_version_prompt {
 
   [ "$full" != "" ] && echo "$full"
 }
- 
+
 function prompt_command() {
     # Check http://github.com/Sirupsen/dotfiles for screenshot
     PS1="$blue\W/$bold_blue$(rvm_version_prompt)$bold_green$(__git_ps1 " (%s)") ${normal}$ "
diff --git a/themes/zork/zork.theme.bash b/themes/zork/zork.theme.bash
index 905d655b..b5872314 100644
--- a/themes/zork/zork.theme.bash
+++ b/themes/zork/zork.theme.bash
@@ -49,7 +49,7 @@ modern_scm_prompt() {
 # show chroot if exist
 chroot(){
     if [ -n "$debian_chroot" ]
-    then 
+    then
         my_ps_chroot="${bold_cyan}$debian_chroot${normal}";
         echo "($my_ps_chroot)";
     fi
@@ -63,7 +63,7 @@ my_ve(){
         my_ps_ve="${bold_purple}${CONDA_DEFAULT_ENV}${normal}";
         echo "($my_ps_ve)";
     elif [ -n "$VIRTUAL_ENV" ]
-    then 
+    then
         my_ps_ve="${bold_purple}$ve${normal}";
         echo "($my_ps_ve)";
     fi
@@ -75,7 +75,7 @@ prompt() {
     my_ps_host="${green}\h${normal}";
     # yes, these are the the same for now ...
     my_ps_host_root="${green}\h${normal}";
- 
+
     my_ps_user="${bold_green}\u${normal}"
     my_ps_root="${bold_red}\u${normal}";
 

From 3a1283dad5c423bdd8ef0920e83fb681632c7cb5 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Tue, 10 Mar 2020 10:18:11 +0200
Subject: [PATCH 336/388] Fix EOF

---
 aliases/available/fuck.aliases.bash                 | 1 -
 aliases/available/node.aliases.bash                 | 1 -
 aliases/available/puppet.aliases.bash               | 1 -
 completion/available/consul.completion.bash         | 2 +-
 completion/available/django.completion.bash         | 1 -
 completion/available/docker-compose.completion.bash | 2 +-
 completion/available/docker-machine.completion.bash | 2 +-
 completion/available/homesick.completion.bash       | 1 -
 completion/available/invoke.completion.bash         | 1 -
 completion/available/maven.completion.bash          | 2 +-
 completion/available/ng.completion.bash             | 1 -
 completion/available/packer.completion.bash         | 1 -
 completion/available/pip3.completion.bash           | 1 -
 completion/available/projects.completion.bash       | 1 -
 completion/available/test_kitchen.completion.bash   | 1 -
 completion/available/tmux.completion.bash           | 1 -
 plugins/available/explain.plugin.bash               | 1 -
 plugins/available/gradle.plugin.bash                | 1 -
 plugins/available/man.plugin.bash                   | 2 +-
 plugins/available/sdkman.plugin.bash                | 1 -
 themes/gitline/powerline.base.bash                  | 1 -
 themes/liquidprompt/.gitignore                      | 1 -
 themes/mbriggs/mbriggs.theme.bash                   | 2 +-
 themes/nwinkler_random_colors/README.md             | 1 -
 themes/powerline/powerline.base.bash                | 1 -
 themes/powerturk/powerturk.theme.bash               | 1 -
 26 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/aliases/available/fuck.aliases.bash b/aliases/available/fuck.aliases.bash
index 959807fb..495ea851 100644
--- a/aliases/available/fuck.aliases.bash
+++ b/aliases/available/fuck.aliases.bash
@@ -8,4 +8,3 @@ fi
 alias please=fuck
 alias plz=please
 alias fucking=sudo
-
diff --git a/aliases/available/node.aliases.bash b/aliases/available/node.aliases.bash
index ddf3c92c..a1408f26 100644
--- a/aliases/available/node.aliases.bash
+++ b/aliases/available/node.aliases.bash
@@ -6,4 +6,3 @@ alias node-dev='export NODE_ENV=development'
 
 # alias to setup nodejs production environment
 alias node-prod='export NODE_ENV=production'
-
diff --git a/aliases/available/puppet.aliases.bash b/aliases/available/puppet.aliases.bash
index bb5b4a1a..15b69923 100644
--- a/aliases/available/puppet.aliases.bash
+++ b/aliases/available/puppet.aliases.bash
@@ -7,4 +7,3 @@ alias puplint="puppet-lint *.pp"
 alias pupagt="puppet agent -t"
 alias pupagtd="puppet agent -t --debug"
 alias pupapp="puppet apply"
-
diff --git a/completion/available/consul.completion.bash b/completion/available/consul.completion.bash
index 2082e344..0180ba2d 100644
--- a/completion/available/consul.completion.bash
+++ b/completion/available/consul.completion.bash
@@ -7,4 +7,4 @@ then
   complete -C "$CONSUL_BIN" consul
 fi
 
-unset CONSUL_BIN
\ No newline at end of file
+unset CONSUL_BIN
diff --git a/completion/available/django.completion.bash b/completion/available/django.completion.bash
index 1c3887eb..aca13ce4 100644
--- a/completion/available/django.completion.bash
+++ b/completion/available/django.completion.bash
@@ -69,4 +69,3 @@ else
 fi
 
 complete -F _python_django_completion -o default $pythons
-
diff --git a/completion/available/docker-compose.completion.bash b/completion/available/docker-compose.completion.bash
index dedd8e31..941f25a3 100644
--- a/completion/available/docker-compose.completion.bash
+++ b/completion/available/docker-compose.completion.bash
@@ -670,4 +670,4 @@ _docker_compose() {
 eval "$__docker_compose_previous_extglob_setting"
 unset __docker_compose_previous_extglob_setting
 
-complete -F _docker_compose docker-compose docker-compose.exe
\ No newline at end of file
+complete -F _docker_compose docker-compose docker-compose.exe
diff --git a/completion/available/docker-machine.completion.bash b/completion/available/docker-machine.completion.bash
index 8c692ff6..07d39d1e 100644
--- a/completion/available/docker-machine.completion.bash
+++ b/completion/available/docker-machine.completion.bash
@@ -413,4 +413,4 @@ _docker_machine() {
     return 0
 }
 
-complete -F _docker_machine docker-machine docker-machine.exe
\ No newline at end of file
+complete -F _docker_machine docker-machine docker-machine.exe
diff --git a/completion/available/homesick.completion.bash b/completion/available/homesick.completion.bash
index d0ebbba4..31104f5b 100644
--- a/completion/available/homesick.completion.bash
+++ b/completion/available/homesick.completion.bash
@@ -57,4 +57,3 @@ _homesick_complete()
 }
 
 complete -o bashdefault -o default -F _homesick_complete homesick
-
diff --git a/completion/available/invoke.completion.bash b/completion/available/invoke.completion.bash
index f062bcab..f90097f2 100644
--- a/completion/available/invoke.completion.bash
+++ b/completion/available/invoke.completion.bash
@@ -28,4 +28,3 @@ _complete_invoke() {
 # * -o default: when function generates no results, use filenames.
 # * positional args: program names to complete for.
 complete -F _complete_invoke -o default invoke inv
-
diff --git a/completion/available/maven.completion.bash b/completion/available/maven.completion.bash
index 75892f13..31216449 100644
--- a/completion/available/maven.completion.bash
+++ b/completion/available/maven.completion.bash
@@ -33,4 +33,4 @@ _mvn()
 
         return 0
 } &&
-complete -F _mvn mvn
\ No newline at end of file
+complete -F _mvn mvn
diff --git a/completion/available/ng.completion.bash b/completion/available/ng.completion.bash
index 827bc22d..f219b303 100644
--- a/completion/available/ng.completion.bash
+++ b/completion/available/ng.completion.bash
@@ -1,4 +1,3 @@
-
 if _command_exists ng; then
   # No longer supported, please see https://github.com/angular/angular-cli/issues/11043
   # Fix courtesy of https://stackoverflow.com/questions/50194674/ng-completion-no-longer-exists
diff --git a/completion/available/packer.completion.bash b/completion/available/packer.completion.bash
index 99c221ea..fb940c9b 100644
--- a/completion/available/packer.completion.bash
+++ b/completion/available/packer.completion.bash
@@ -161,4 +161,3 @@ _packer_completion ()
 }
 
 complete -o nospace -F _packer_completion packer
-
diff --git a/completion/available/pip3.completion.bash b/completion/available/pip3.completion.bash
index 599e96e5..1e2ffb42 100644
--- a/completion/available/pip3.completion.bash
+++ b/completion/available/pip3.completion.bash
@@ -8,4 +8,3 @@
 if command -v pip3 >/dev/null; then
   eval "$(pip3 completion --bash)"
 fi
-
diff --git a/completion/available/projects.completion.bash b/completion/available/projects.completion.bash
index 4d148704..90735ee1 100644
--- a/completion/available/projects.completion.bash
+++ b/completion/available/projects.completion.bash
@@ -44,4 +44,3 @@ _pj() {
 
 complete -F _pj -o nospace pj
 complete -F _pj -o nospace pjo
-
diff --git a/completion/available/test_kitchen.completion.bash b/completion/available/test_kitchen.completion.bash
index 2420aab0..25459981 100644
--- a/completion/available/test_kitchen.completion.bash
+++ b/completion/available/test_kitchen.completion.bash
@@ -28,4 +28,3 @@ __kitchen_options () {
   esac
 }
 complete -F __kitchen_options kitchen
-
diff --git a/completion/available/tmux.completion.bash b/completion/available/tmux.completion.bash
index ddadcbd8..6bb8293f 100644
--- a/completion/available/tmux.completion.bash
+++ b/completion/available/tmux.completion.bash
@@ -185,4 +185,3 @@ _tmux() {
 complete -F _tmux tmux
 
 # END tmux completion
-
diff --git a/plugins/available/explain.plugin.bash b/plugins/available/explain.plugin.bash
index 1fb38bdd..ab7b4a0c 100644
--- a/plugins/available/explain.plugin.bash
+++ b/plugins/available/explain.plugin.bash
@@ -21,4 +21,3 @@ explain () {
     echo "explain 'cmd -o | ...'   one quoted command to explain it."
   fi
 }
-
diff --git a/plugins/available/gradle.plugin.bash b/plugins/available/gradle.plugin.bash
index 387f5fd5..6267bd84 100644
--- a/plugins/available/gradle.plugin.bash
+++ b/plugins/available/gradle.plugin.bash
@@ -19,4 +19,3 @@ function gw() {
   # Call gradle
   "${result}" $*
 }
-
diff --git a/plugins/available/man.plugin.bash b/plugins/available/man.plugin.bash
index 438779f0..473f04fd 100644
--- a/plugins/available/man.plugin.bash
+++ b/plugins/available/man.plugin.bash
@@ -7,4 +7,4 @@ export LESS_TERMCAP_me=$'\e[0m'
 export LESS_TERMCAP_se=$'\e[0m'
 export LESS_TERMCAP_so=$'\e[01;33m'
 export LESS_TERMCAP_ue=$'\e[0m'
-export LESS_TERMCAP_us=$'\e[1;4;31m'
\ No newline at end of file
+export LESS_TERMCAP_us=$'\e[1;4;31m'
diff --git a/plugins/available/sdkman.plugin.bash b/plugins/available/sdkman.plugin.bash
index 072fbbb3..a4048c11 100644
--- a/plugins/available/sdkman.plugin.bash
+++ b/plugins/available/sdkman.plugin.bash
@@ -6,4 +6,3 @@ about-plugin 'Load Software Development Kit Manager'
 export SDKMAN_DIR=${SDKMAN_DIR:-$HOME/.sdkman}
 
 [[ -s "${SDKMAN_DIR}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR}/bin/sdkman-init.sh"
-
diff --git a/themes/gitline/powerline.base.bash b/themes/gitline/powerline.base.bash
index 45387b02..0f8a3028 100644
--- a/themes/gitline/powerline.base.bash
+++ b/themes/gitline/powerline.base.bash
@@ -225,4 +225,3 @@ function __powerline_prompt_command {
         LEFT_PROMPT \
         SEGMENTS_AT_LEFT
 }
-
diff --git a/themes/liquidprompt/.gitignore b/themes/liquidprompt/.gitignore
index a8144dd5..760c6d6f 100644
--- a/themes/liquidprompt/.gitignore
+++ b/themes/liquidprompt/.gitignore
@@ -1,2 +1 @@
 liquidprompt
-
diff --git a/themes/mbriggs/mbriggs.theme.bash b/themes/mbriggs/mbriggs.theme.bash
index 169f8d7c..697fe026 100644
--- a/themes/mbriggs/mbriggs.theme.bash
+++ b/themes/mbriggs/mbriggs.theme.bash
@@ -31,4 +31,4 @@ function prompt() {
     PS1="\n${n_commands} ${user_host} ${prompt_symbol} ${ruby} ${open}${current_path}${git_branch}${close}${return_status}\n${prompt_char}"
 }
 
-safe_append_prompt_command prompt
\ No newline at end of file
+safe_append_prompt_command prompt
diff --git a/themes/nwinkler_random_colors/README.md b/themes/nwinkler_random_colors/README.md
index 80620efb..69bfcd69 100644
--- a/themes/nwinkler_random_colors/README.md
+++ b/themes/nwinkler_random_colors/README.md
@@ -26,4 +26,3 @@ Here it is in action:
 ## Usage Scenario
 
 This theme is especially useful when connecting to many different machines and switching between them often. Yes, the hostname *is* present in the prompt. But I argue that it's a lot faster to get a "feel" of what machine you are currently on because of the custom colors on that machine's prompt than by reading the hostname.
-
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 8c983a7b..3655e851 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -280,4 +280,3 @@ function __powerline_prompt_command {
         LEFT_PROMPT \
         SEGMENTS_AT_LEFT
 }
-
diff --git a/themes/powerturk/powerturk.theme.bash b/themes/powerturk/powerturk.theme.bash
index 35404360..4590a8aa 100644
--- a/themes/powerturk/powerturk.theme.bash
+++ b/themes/powerturk/powerturk.theme.bash
@@ -182,4 +182,3 @@ function powerline_prompt_command() {
 }
 
 PROMPT_COMMAND=powerline_prompt_command
-

From 81f7af5036cd633d4e585b74ac6d887007c60b32 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Tue, 10 Mar 2020 10:37:07 +0200
Subject: [PATCH 337/388] In case we ARE committing to tabs now...

---
 .editorconfig | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e302645a..18a9fca0 100755
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +1,36 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
 [*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
+indent_style = tab
+indent_size = 1
+
+shell_variant      = bash
+binary_next_line   = true  # like -bn
+switch_case_indent = true  # like -ci
+space_redirects    = true  # like -sr
+keep_padding       = true  # like -kp
+end_of_line        = lf
+charset            = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
 
+
 [.git*]
 indent_style = tab
+
+[*.*sh]
+indent_style = tab
+indent_size = 1
+
+shell_variant      = bash
+binary_next_line   = true  # like -bn
+switch_case_indent = true  # like -ci
+space_redirects    = true  # like -sr
+keep_padding       = true  # like -kp
+end_of_line        = lf
+charset            = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

From eca68db8ccc2f980a5dbfcc2d0d965ced95ad1c2 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Wed, 25 Mar 2020 09:42:17 +0200
Subject: [PATCH 338/388] Fixing the indent to everyone's content

---
 .editorconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 18a9fca0..5a376252 100755
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,7 +2,7 @@
 
 [*]
 indent_style = tab
-indent_size = 1
+indent_size = 4
 
 shell_variant      = bash
 binary_next_line   = true  # like -bn
@@ -23,7 +23,7 @@ indent_style = tab
 
 [*.*sh]
 indent_style = tab
-indent_size = 1
+indent_size = 4
 
 shell_variant      = bash
 binary_next_line   = true  # like -bn

From 507e4bec82e3cc40c6bc3488b0bdf387acdfc49e Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 21 Jun 2020 16:03:18 +0300
Subject: [PATCH 339/388] Convert files with spaces and tabs to only spaces

---
 completion/available/salt.completion.bash     | 116 +++++-----
 .../available/virtualbox.completion.bash      | 208 +++++++++---------
 themes/parrot/parrot.theme.bash               |   4 +-
 3 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/completion/available/salt.completion.bash b/completion/available/salt.completion.bash
index 7634dcdc..de493af9 100644
--- a/completion/available/salt.completion.bash
+++ b/completion/available/salt.completion.bash
@@ -35,10 +35,10 @@ _salt(){
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     if [ ${COMP_CWORD} -gt 2 ]; then
-	pprev="${COMP_WORDS[COMP_CWORD-2]}"
+    pprev="${COMP_WORDS[COMP_CWORD-2]}"
     fi
     if [ ${COMP_CWORD} -gt 3 ]; then
-	ppprev="${COMP_WORDS[COMP_CWORD-3]}"
+    ppprev="${COMP_WORDS[COMP_CWORD-3]}"
     fi
 
     opts="-h --help -d --doc --documentation --version --versions-report -c \
@@ -96,7 +96,7 @@ _salt(){
      -G|--grain|--grain-pcre)
         COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
         return 0
-	;;
+        ;;
      -C|--compound)
         COMPREPLY=() # TODO: finish this one? how?
         return 0
@@ -110,7 +110,7 @@ _salt(){
         return 0
         ;;
      -N|--nodegroup)
-	    MASTER_CONFIG='/etc/salt/master'
+        MASTER_CONFIG='/etc/salt/master'
         COMPREPLY=($(compgen -W "`awk -F ':'  'BEGIN {print_line = 0};  /^nodegroups/ {print_line = 1;getline } print_line && /^  */ {print $1} /^[^ ]/ {print_line = 0}' <${MASTER_CONFIG}`" -- ${cur}))
         return 0
      ;;
@@ -193,7 +193,7 @@ _saltkey(){
         return 0
      ;;
      --accept-all)
-	return 0
+        return 0
      ;;
     esac
     COMPREPLY=($(compgen -W "${opts} " -- ${cur}))
@@ -230,21 +230,21 @@ _saltcall(){
     fi
 
     case ${prev} in
-        -m|--module-dirs)
-                COMPREPLY=( $(compgen -d ${cur} ))
-		return 0
- 	 	;;
-	-l|--log-level)
-		COMPREPLY=( $(compgen -W "info none garbage trace warning error debug" -- ${cur}))
-		return 0
-		;;
-	-g|grains)
-                return 0
-		;;
-	salt-call)
-                COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	        return 0
-		;;
+    -m|--module-dirs)
+        COMPREPLY=( $(compgen -d ${cur} ))
+        return 0
+        ;;
+    -l|--log-level)
+        COMPREPLY=( $(compgen -W "info none garbage trace warning error debug" -- ${cur}))
+        return 0
+        ;;
+    -g|grains)
+        return 0
+        ;;
+    salt-call)
+        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+        return 0
+        ;;
     esac
 
     _salt_coms="$(salt-call --out=txt -- sys.list_functions|sed 's/^.*\[//' | tr -d ",']"  )"
@@ -279,46 +279,46 @@ _saltcp(){
     fi
 
     case ${prev} in
- 	salt-cp)
-	    COMPREPLY=($(compgen -W "${opts} `salt-key -l acc --no-color`" -- ${cur}))
-	    return 0
-	;;
-        -t|--timeout)
-	    # those numbers are just a hint
-            COMPREPLY=($(compgen -W "2 3 4 8 10 15 20 25 30 40 60 90 120 180 240 300" -- ${cur} ))
-	    return 0
-        ;;
-	-E|--pcre)
-            COMPREPLY=($(compgen -W "`salt-key -l acc --no-color`" -- ${cur}))
-            return 0
-	;;
-	-L|--list)
-	    # IMPROVEMENTS ARE WELCOME
-	    prefpart="${cur%,*},"
-	    postpart=${cur##*,}
-	    filt="^\($(echo ${cur}| sed 's:,:\\|:g')\)$"
+    salt-cp)
+        COMPREPLY=($(compgen -W "${opts} `salt-key -l acc --no-color`" -- ${cur}))
+        return 0
+    ;;
+    -t|--timeout)
+        # those numbers are just a hint
+        COMPREPLY=($(compgen -W "2 3 4 8 10 15 20 25 30 40 60 90 120 180 240 300" -- ${cur} ))
+        return 0
+    ;;
+    -E|--pcre)
+        COMPREPLY=($(compgen -W "`salt-key -l acc --no-color`" -- ${cur}))
+        return 0
+    ;;
+    -L|--list)
+        # IMPROVEMENTS ARE WELCOME
+        prefpart="${cur%,*},"
+        postpart=${cur##*,}
+        filt="^\($(echo ${cur}| sed 's:,:\\|:g')\)$"
             helper=($(salt-key -l acc --no-color | grep -v "${filt}" | sed "s/^/${prefpart}/"))
-	    COMPREPLY=($(compgen -W "${helper[*]}" -- ${cur}))
+        COMPREPLY=($(compgen -W "${helper[*]}" -- ${cur}))
 
-	    return 0
-	;;
-	-G|--grain|--grain-pcre)
-            COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
-            return 0
-	    ;;
-	    # FIXME
-	-R|--range)
-	    # FIXME ??
-	    return 0
-	;;
-	-C|--compound)
-	    # FIXME ??
-	    return 0
-	;;
-	-c|--config)
-	    COMPREPLY=($(compgen -f -- ${cur}))
-	    return 0
-	;;
+        return 0
+    ;;
+    -G|--grain|--grain-pcre)
+        COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur}))
+        return 0
+        ;;
+        # FIXME
+    -R|--range)
+        # FIXME ??
+        return 0
+    ;;
+    -C|--compound)
+        # FIXME ??
+        return 0
+    ;;
+    -c|--config)
+        COMPREPLY=($(compgen -f -- ${cur}))
+        return 0
+    ;;
     esac
 
    # default is using opts:
diff --git a/completion/available/virtualbox.completion.bash b/completion/available/virtualbox.completion.bash
index d0d41df2..3c29437f 100644
--- a/completion/available/virtualbox.completion.bash
+++ b/completion/available/virtualbox.completion.bash
@@ -10,13 +10,13 @@ __vboxmanage_startvm() {
 
     AVAILABLE=""
     for VM in $TOTAL; do
-	MATCH=0;
-	for RUN in $RUNNING "x"; do
-	    if [ "$VM" == "$RUN" ]; then
-		MATCH=1
-	    fi
-	done
-	(( $MATCH == 0 )) && AVAILABLE="$AVAILABLE $VM "
+    MATCH=0;
+    for RUN in $RUNNING "x"; do
+        if [ "$VM" == "$RUN" ]; then
+        MATCH=1
+        fi
+    done
+    (( $MATCH == 0 )) && AVAILABLE="$AVAILABLE $VM "
     done
     echo $AVAILABLE
 }
@@ -26,14 +26,14 @@ __vboxmanage_list() {
 
     PRUNED=""
     if [ "$1" == "long" ]; then
-	for WORD in $INPUT; do
-	    [ "$WORD" == "-l" ] && continue;
-	    [ "$WORD" == "--long" ] && continue;
+    for WORD in $INPUT; do
+        [ "$WORD" == "-l" ] && continue;
+        [ "$WORD" == "--long" ] && continue;
 
-	    PRUNED="$PRUNED $WORD"
-	done
+        PRUNED="$PRUNED $WORD"
+    done
     else
-	PRUNED=$INPUT
+    PRUNED=$INPUT
     fi
 
     echo $PRUNED
@@ -43,14 +43,14 @@ __vboxmanage_list() {
 __vboxmanage_list_vms() {
     VMS=""
     if [ "x$1" == "x" ]; then
-	SEPARATOR=" "
+    SEPARATOR=" "
     else
-	SEPARATOR=$1
+    SEPARATOR=$1
     fi
 
     for VM in $(vboxmanage list vms | cut -d' ' -f1 | tr -d '"'); do
-	[ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}"
-	VMS="${VMS}${VM}"
+    [ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}"
+    VMS="${VMS}${VM}"
     done
 
     echo $VMS
@@ -59,14 +59,14 @@ __vboxmanage_list_vms() {
 __vboxmanage_list_runningvms() {
     VMS=""
     if [ "$1" == "" ]; then
-	SEPARATOR=" "
+    SEPARATOR=" "
     else
-	SEPARATOR=$1
+    SEPARATOR=$1
     fi
 
     for VM in $(vboxmanage list runningvms | cut -d' ' -f1 | tr -d '"'); do
-	[ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}"
-	VMS="${VMS}${VM}"
+    [ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}"
+    VMS="${VMS}${VM}"
     done
 
     echo $VMS
@@ -102,40 +102,40 @@ __vboxmanage_default() {
     # echo "DEBUG: cur: $cur, prev: $prev"
     # echo "DEBUG: default: |$p1|$p2|$p3|$p4|"
     case ${cur} in
- 	-*)
-	    echo $opts
- 	    # COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
- 	    return 0
- 	    ;;
+    -*)
+        echo $opts
+        # COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+        return 0
+        ;;
     esac;
 
     for WORD in $opts; do
-	MATCH=0
-	for OPT in "${COMP_WORDS[@]}"; do
-		    # opts=$(echo ${opts} | grep -v $OPT);
-	    if [ "$OPT" == "$WORD" ]; then
-		MATCH=1
-		break;
-	    fi
-	    if [ "$OPT" == "-v" ] && [ "$WORD" == "--version" ]; then
-		MATCH=1
-		break;
-	    fi
-	    if [ "$OPT" == "--version" ] && [ "$WORD" == "-v" ]; then
-		MATCH=1
-		break;
-	    fi
-	    if [ "$OPT" == "-q" ] && [ "$WORD" == "--nologo" ]; then
-		MATCH=1
-		break;
-	    fi
-	    if [ "$OPT" == "--nologo" ] && [ "$WORD" == "-q" ]; then
-		MATCH=1
-		break;
-	    fi
-	done
-	(( $MATCH == 1 )) && continue;
-	pruned="$pruned $WORD"
+    MATCH=0
+    for OPT in "${COMP_WORDS[@]}"; do
+            # opts=$(echo ${opts} | grep -v $OPT);
+        if [ "$OPT" == "$WORD" ]; then
+        MATCH=1
+        break;
+        fi
+        if [ "$OPT" == "-v" ] && [ "$WORD" == "--version" ]; then
+        MATCH=1
+        break;
+        fi
+        if [ "$OPT" == "--version" ] && [ "$WORD" == "-v" ]; then
+        MATCH=1
+        break;
+        fi
+        if [ "$OPT" == "-q" ] && [ "$WORD" == "--nologo" ]; then
+        MATCH=1
+        break;
+        fi
+        if [ "$OPT" == "--nologo" ] && [ "$WORD" == "-q" ]; then
+        MATCH=1
+        break;
+        fi
+    done
+    (( $MATCH == 1 )) && continue;
+    pruned="$pruned $WORD"
 
     done
 
@@ -156,65 +156,65 @@ _vboxmanage() {
 
     # In case current is complete command
     case $cur in
-	startvm|list|controlvm)
-	    COMPREPLY=($(compgen -W "$cur "))
-	    return 0
-	    ;;
+    startvm|list|controlvm)
+        COMPREPLY=($(compgen -W "$cur "))
+        return 0
+        ;;
     esac
 
     case $prev in
-	-v|--version)
-	    return 0
-	    ;;
+    -v|--version)
+        return 0
+        ;;
 
-	-l|--long)
-	    opts=$(__vboxmanage_list "long")
-	    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	    return 0
-	    ;;
-	startvm|list)
-	    opts=$(__vboxmanage_$prev)
-	    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	    return 0
-	    ;;
-	--type)
-	    COMPREPLY=($(compgen -W "gui headless" -- ${cur}))
-	    return 0
-	    ;;
-	gui|headless)
-	    # Done. no more completion possible
-	    return 0
-	    ;;
-	vboxmanage|-q|--nologo)
-	    # echo "Got vboxmanage"
-	    opts=$(__vboxmanage_default)
-	    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	    return 0
-	    ;;
-	controlvm)
-	    opts=$(__vboxmanage_list_vms)
-	    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-	    return 0
-	    ;;
+    -l|--long)
+        opts=$(__vboxmanage_list "long")
+        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+        return 0
+        ;;
+    startvm|list)
+        opts=$(__vboxmanage_$prev)
+        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+        return 0
+        ;;
+    --type)
+        COMPREPLY=($(compgen -W "gui headless" -- ${cur}))
+        return 0
+        ;;
+    gui|headless)
+        # Done. no more completion possible
+        return 0
+        ;;
+    vboxmanage|-q|--nologo)
+        # echo "Got vboxmanage"
+        opts=$(__vboxmanage_default)
+        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+        return 0
+        ;;
+    controlvm)
+        opts=$(__vboxmanage_list_vms)
+        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+        return 0
+        ;;
     esac
 
     for VM in $(__vboxmanage_list_vms); do
-	if [ "$VM" == "$prev" ]; then
-	    pprev=${COMP_WORDS[COMP_CWORD-2]}
-	    # echo "previous: $pprev"
-	    case $pprev in
-		startvm)
- 		    opts="--type"
-		    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-		    return 0
-		    ;;
-		controlvm)
-		    opts=$(__vboxmanage_controlvm)
-		    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-		    return 0;
-		    ;;
-	    esac
-	fi
+    if [ "$VM" == "$prev" ]; then
+        pprev=${COMP_WORDS[COMP_CWORD-2]}
+        # echo "previous: $pprev"
+        case $pprev in
+        startvm)
+            opts="--type"
+            COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+            return 0
+            ;;
+        controlvm)
+            opts=$(__vboxmanage_controlvm)
+            COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+            return 0;
+            ;;
+        esac
+    fi
     done
 
     # echo "Got to end withoug completion"
diff --git a/themes/parrot/parrot.theme.bash b/themes/parrot/parrot.theme.bash
index 815aa952..a0d259dd 100644
--- a/themes/parrot/parrot.theme.bash
+++ b/themes/parrot/parrot.theme.bash
@@ -20,9 +20,9 @@ function prompt() {
         # 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.)
-        	local color_prompt=yes
+            local color_prompt=yes
         else
-        	local color_prompt=
+            local color_prompt=
         fi
     fi
 

From 1f5d9b757f92da1998cdf19427d0ff494871ca87 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 28 Oct 2020 21:02:47 +0200
Subject: [PATCH 340/388] Fix newline and trailing space issues

---
 aliases/available/terraform.aliases.bash  | 1 -
 aliases/available/terragrunt.aliases.bash | 1 -
 completion/available/kind.completion.bash | 1 -
 themes/githelpers.theme.bash              | 6 +++---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/aliases/available/terraform.aliases.bash b/aliases/available/terraform.aliases.bash
index af5276de..d62a8c2c 100644
--- a/aliases/available/terraform.aliases.bash
+++ b/aliases/available/terraform.aliases.bash
@@ -8,4 +8,3 @@ alias tfv='terraform validate'
 alias tfp='terraform plan'
 alias tfa='terraform apply'
 alias tfd='terraform destory'
-
diff --git a/aliases/available/terragrunt.aliases.bash b/aliases/available/terragrunt.aliases.bash
index f1d7e182..9395b351 100644
--- a/aliases/available/terragrunt.aliases.bash
+++ b/aliases/available/terragrunt.aliases.bash
@@ -13,4 +13,3 @@ alias tgva='terragrunt validate-all'
 alias tgpa='terragrunt plan-all'
 alias tgaa='terragrunt apply-all'
 alias tgda='terragrunt destroy-all'
-
diff --git a/completion/available/kind.completion.bash b/completion/available/kind.completion.bash
index f7b061fe..be12a2d2 100644
--- a/completion/available/kind.completion.bash
+++ b/completion/available/kind.completion.bash
@@ -3,4 +3,3 @@
 if _command_exists kind; then
   eval "$(kind completion bash)"
 fi
-
diff --git a/themes/githelpers.theme.bash b/themes/githelpers.theme.bash
index 2d5829ff..ba089392 100644
--- a/themes/githelpers.theme.bash
+++ b/themes/githelpers.theme.bash
@@ -11,7 +11,7 @@ function _git-symbolic-ref {
 function _git-branch {
   if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     test -n "${VCS_STATUS_LOCAL_BRANCH}" && echo "${VCS_STATUS_LOCAL_BRANCH}" || return 1
-  else 
+  else
     git symbolic-ref -q --short HEAD 2> /dev/null || return 1
   fi
 }
@@ -19,7 +19,7 @@ function _git-branch {
 function _git-tag {
   if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     test -n "${VCS_STATUS_TAG}" && echo "${VCS_STATUS_TAG}"
-  else 
+  else
     git describe --tags --exact-match 2> /dev/null
   fi
 }
@@ -40,7 +40,7 @@ function _git-short-sha {
 function _git-friendly-ref {
   if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
     _git-branch || _git-tag || _git-short-sha # there is no tag based describe output in gitstatus
-  else 
+  else
     _git-branch || _git-tag || _git-commit-description || _git-short-sha
   fi
 }

From 54116fc0683cdb8c9f70a3b1bacad97c6ba32afd Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 29 Oct 2020 23:05:23 +0200
Subject: [PATCH 341/388] Bump shellcheck, shfmt hooks to 2.1.4

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 696fabf4..0a7ab794 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
       - id: mixed-line-ending
       - id: check-added-large-files
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 1.11.0
+    rev: 2.1.4
     hooks:
       - id: git-check  # Configure in .gitattributes
       - id: shellcheck

From dd1474990ce6fb26265297bcc58107e507809f27 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 29 Oct 2020 23:05:49 +0200
Subject: [PATCH 342/388] Modify general editorconfig settings

---
 .editorconfig | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 5a376252..3997f583 100755
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,23 +1,17 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
 [*]
-indent_style = tab
-indent_size = 4
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
 
-shell_variant      = bash
-binary_next_line   = true  # like -bn
-switch_case_indent = true  # like -ci
-space_redirects    = true  # like -sr
-keep_padding       = true  # like -kp
-end_of_line        = lf
-charset            = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
 
-
 [.git*]
 indent_style = tab
 

From 0b9da701c4dcfabad8d12c7cec44400d73de27a5 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 29 Oct 2020 23:14:33 +0200
Subject: [PATCH 343/388] Rename lint CI job

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 535709c4..0a2dd357 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ jobs:
   include:
   - language: go
     go: "1.14"
-    name: Ubuntu 18.04
+    name: pre-commit lint
     dist: bionic
     sudo: required
     before_script:

From 3f688170478571f2de2d5c0457c655f878f63fa3 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 28 Oct 2020 21:04:04 +0200
Subject: [PATCH 344/388] Clean 90210 theme

---
 clean_files.txt               | 1 +
 themes/90210/90210.theme.bash | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index e69de29b..f0f8457e 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -0,0 +1 @@
+themes/90210/90210.theme.bash
diff --git a/themes/90210/90210.theme.bash b/themes/90210/90210.theme.bash
index e683e0ef..97c23f0e 100644
--- a/themes/90210/90210.theme.bash
+++ b/themes/90210/90210.theme.bash
@@ -10,8 +10,8 @@ GIT_THEME_PROMPT_PREFIX=" ${green}|"
 GIT_THEME_PROMPT_SUFFIX="${green}|"
 
 # Nicely formatted terminal prompt
-function prompt_command(){
-  export PS1="\n${bold_black}[${blue}\@${bold_black}]-${bold_black}[${green}\u${yellow}@${green}\h${bold_black}]-${bold_black}[${purple}\w${bold_black}]-$(scm_prompt_info)\n${reset_color}\$ "
+function prompt_command() {
+	export PS1="\n${bold_black}[${blue}\@${bold_black}]-${bold_black}[${green}\u${yellow}@${green}\h${bold_black}]-${bold_black}[${purple}\w${bold_black}]-$(scm_prompt_info)\n${reset_color}\$ "
 }
 
 safe_append_prompt_command prompt_command

From b667a719952bbe508795f3f9535f5d6421c356a5 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 24 Oct 2020 10:45:38 +0300
Subject: [PATCH 345/388] docs: Add basic sphinx docs

---
 docs/Makefile  | 20 ++++++++++++++++++
 docs/conf.py   | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 docs/index.rst | 14 +++++++++++++
 docs/make.bat  | 35 ++++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+)
 create mode 100644 docs/Makefile
 create mode 100644 docs/conf.py
 create mode 100644 docs/index.rst
 create mode 100644 docs/make.bat

diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 00000000..d4bb2cbb
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644
index 00000000..af4615e5
--- /dev/null
+++ b/docs/conf.py
@@ -0,0 +1,55 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- Project information -----------------------------------------------------
+
+project = 'Bash-it'
+copyright = '2020, Bash-it Team'
+author = 'Bash-it Team'
+
+# The full version, including alpha/beta/rc tags
+release = ''
+
+
+# -- General configuration ---------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 00000000..d70cf6de
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,14 @@
+Welcome to Bash-it's documentation!
+===================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`search`
diff --git a/docs/make.bat b/docs/make.bat
new file mode 100644
index 00000000..2119f510
--- /dev/null
+++ b/docs/make.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd

From 6abb26c6c6970ff68281085495e7ce4f7b6e5de1 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 28 Oct 2020 09:20:02 +0200
Subject: [PATCH 346/388] docs: Add empty _static and _templates directories

---
 docs/_static/.keep    | 0
 docs/_templates/.keep | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/_static/.keep
 create mode 100644 docs/_templates/.keep

diff --git a/docs/_static/.keep b/docs/_static/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/_templates/.keep b/docs/_templates/.keep
new file mode 100644
index 00000000..e69de29b

From f7e295f691c8a245771d9538f5b2045c5dc35e10 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 25 Oct 2020 14:51:02 +0200
Subject: [PATCH 347/388] Move most of the documentation to .rst format

---
 docs/commands/doctor.rst |  20 ++++
 docs/commands/index.rst  |  15 +++
 docs/commands/reload.rst |  10 ++
 docs/commands/search.rst |  59 ++++++++++++
 docs/commands/update.rst |  38 ++++++++
 docs/contributing.rst    | 108 +++++++++++++++++++++
 docs/custom.rst          |  18 ++++
 docs/development.rst     |  94 +++++++++++++++++++
 docs/index.rst           |  40 ++++++--
 docs/installation.rst    |  57 +++++++++++
 docs/misc.rst            |  76 +++++++++++++++
 docs/test.rst            |  46 +++++++++
 docs/themes.rst          |  35 +++++++
 docs/uninstalling.rst    |  14 +++
 docs/vcs_user.rst        | 198 +++++++++++++++++++++++++++++++++++++++
 15 files changed, 822 insertions(+), 6 deletions(-)
 create mode 100644 docs/commands/doctor.rst
 create mode 100644 docs/commands/index.rst
 create mode 100644 docs/commands/reload.rst
 create mode 100644 docs/commands/search.rst
 create mode 100644 docs/commands/update.rst
 create mode 100644 docs/contributing.rst
 create mode 100644 docs/custom.rst
 create mode 100644 docs/development.rst
 create mode 100644 docs/installation.rst
 create mode 100644 docs/misc.rst
 create mode 100644 docs/test.rst
 create mode 100644 docs/themes.rst
 create mode 100644 docs/uninstalling.rst
 create mode 100644 docs/vcs_user.rst

diff --git a/docs/commands/doctor.rst b/docs/commands/doctor.rst
new file mode 100644
index 00000000..625eff20
--- /dev/null
+++ b/docs/commands/doctor.rst
@@ -0,0 +1,20 @@
+.. _doctor:
+
+Bash-it doctor
+^^^^^^^^^^^^^^
+
+If you encounter problems with any part of Bash-it, run the following command:
+
+.. code-block:: bash
+
+   bash-it doctor
+
+This will reload your bash profile and print out logs of various parts in Bash-it.
+Note that this command at default will print all logs, including debug logs.
+You can call it like this:
+
+.. code-block:: bash
+
+   bash-it doctor [errors/warnings/all]
+
+In order to get wanted verbosity.
diff --git a/docs/commands/index.rst b/docs/commands/index.rst
new file mode 100644
index 00000000..3eee3b3a
--- /dev/null
+++ b/docs/commands/index.rst
@@ -0,0 +1,15 @@
+.. _commands:
+
+Bash-it Commands
+================
+
+**Bash-it** boasts a wide range of available commands.
+You should be familiar with them in order to fully utilize Bash-it.
+
+.. toctree::
+   :maxdepth: 1
+
+   update
+   search
+   reload
+   doctor
diff --git a/docs/commands/reload.rst b/docs/commands/reload.rst
new file mode 100644
index 00000000..722182d1
--- /dev/null
+++ b/docs/commands/reload.rst
@@ -0,0 +1,10 @@
+.. _reload:
+
+Bash-it reload
+^^^^^^^^^^^^^^
+
+Bash-it creates a ``reload`` alias that makes it convenient to reload
+your Bash profile when you make changes.
+
+Additionally, if you export ``BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE`` as a non-null value,
+Bash-it will automatically reload itself after activating or deactivating plugins, aliases, or completions.
diff --git a/docs/commands/search.rst b/docs/commands/search.rst
new file mode 100644
index 00000000..1b455f22
--- /dev/null
+++ b/docs/commands/search.rst
@@ -0,0 +1,59 @@
+.. _searching:
+
+Bash-it search
+--------------
+
+If you need to quickly find out which of the plugins, aliases or completions are available for a specific framework, programming language, or an environment, you can *search* for multiple terms related to the commands you use frequently.
+Search will find and print out modules with the name or description matching the terms provided.
+
+Syntax
+^^^^^^
+
+.. code-block:: bash
+
+     bash-it search term1 [[-]term2] [[-]term3]....
+
+As an example, a ruby developer might want to enable everything related to the commands such as ``ruby``\ , ``rake``\ , ``gem``\ , ``bundler``\ , and ``rails``.
+Search command helps you find related modules so that you can decide which of them you'd like to use:
+
+.. code-block:: bash
+
+   ❯ bash-it search ruby rake gem bundle irb rails
+         aliases:  bundler rails
+         plugins:  chruby chruby-auto ruby
+     completions:  bundler gem rake
+
+Currently enabled modules will be shown in green.
+
+Searching with Negations
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can prefix a search term with a "-" to exclude it from the results.
+In the above example, if we wanted to hide ``chruby`` and ``chruby-auto``\ ,
+we could change the command as follows:
+
+.. code-block:: bash
+
+   ❯ bash-it search ruby rake gem bundle irb rails -chruby
+         aliases:  bundler rails
+         plugins:  ruby
+     completions:  bundler gem rake
+
+Using Search to Enable or Disable Components
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+By adding a ``--enable`` or ``--disable`` to the search command, you can automatically enable all modules that come up as a result of a search query.
+This could be quite handy if you like to enable a bunch of components related to the same topic.
+
+Disabling ASCII Color
+^^^^^^^^^^^^^^^^^^^^^
+
+To remove non-printing non-ASCII characters responsible for the coloring of the search output, you can set environment variable ``NO_COLOR``.
+Enabled components will then be shown with a checkmark:
+
+.. code-block:: bash
+
+   ❯ NO_COLOR=1 bash-it search ruby rake gem bundle irb rails -chruby
+         aliases  =>   ✓bundler ✓rails
+         plugins  =>   ✓ruby
+     completions  =>   bundler gem rake
diff --git a/docs/commands/update.rst b/docs/commands/update.rst
new file mode 100644
index 00000000..92db60fb
--- /dev/null
+++ b/docs/commands/update.rst
@@ -0,0 +1,38 @@
+.. _update:
+
+Bash-it update
+^^^^^^^^^^^^^^
+
+To update Bash-it to the latest stable version, simply run:
+
+.. code-block:: bash
+
+   bash-it update stable
+
+If you want to update to the latest dev version (directly from master), run:
+
+.. code-block:: bash
+
+   bash-it update dev
+
+If you want to update automatically and unattended, you can add the optional
+``-s/--silent`` flag, for example:
+
+.. code-block:: bash
+
+   bash-it update dev --silent
+
+.. _migrate:
+
+Bash-it migrate
+^^^^^^^^^^^^^^^
+
+If you are using an older version of Bash-it, it's possible that some functionality has changed, or that the internal structure of how Bash-it organizes its functionality has been updated.
+For these cases, we provide a ``migrate`` command:
+
+.. code-block:: bash
+
+   bash-it migrate
+
+This command will automatically migrate the Bash-it structure to the latest version.
+The ``migrate`` command is run automatically if you run the ``update``\ , ``enable`` or ``disable`` commands.
diff --git a/docs/contributing.rst b/docs/contributing.rst
new file mode 100644
index 00000000..e2c3f5ca
--- /dev/null
+++ b/docs/contributing.rst
@@ -0,0 +1,108 @@
+.. _contributing:
+
+Contribution Guidelines
+=======================
+
+When contributing a new feature, a bug fix, a new theme, or any other change to Bash-it, please consider the following guidelines.
+Most of this is common sense, but please try to stick to the conventions listed here.
+
+Issues
+------
+
+
+* When opening a new issue in the issue tracker, please include information about which *Operating System* you're using, and which version of *Bash*.
+* In many cases, it also makes sense to show which Bash-it plugins you are using.
+  This information can be obtained using ``bash-it show plugins``.
+* If the issue happens while loading Bash-it, please also include your ``~/.bash_profile`` or ``~/.bashrc`` file,
+  as well as the install location of Bash-it (default should be ``~/.bash_it``\ ).
+* When reporting a bug or requesting a new feature, consider providing a Pull Request that fixes the issue or can be used as a starting point for the new feature.
+  Don't be afraid, most things aren't that complex...
+
+Pull Requests
+-------------
+
+
+* Fork the Bash-it repo, create a new feature branch from *master* and apply your changes there.
+  Create a *Pull Request* from your feature branch against Bash-it's *master* branch.
+* Limit each Pull Request to one feature.
+  Don't bundle multiple features/changes (e.g. a new *Theme* and a fix to an existing plugin) into a single Pull Request - create one PR for the theme, and a separate PR for the fix.
+* For complex changes, try to *squash* your changes into a single commit before
+  pushing code. Once you've pushed your code and opened a PR, please refrain
+  from force-pushing changes to the PR branch – remember, Bash-it is a
+  distributed project and your branch may be in use already.
+* When in doubt, open a PR with too many commits. Bash-it is a learning project
+  for everyone involved. Showing your work provides a great history for folks
+  to learn what works and what didn't.
+
+Code Style
+----------
+
+
+* Try to stick to the existing code style. Please don't reformat or change the syntax of existing code simply because you don't like that style.
+* Indentation is using spaces, not tabs. Most of the code is indented with 2 spaces, some with 4 spaces. Please try to stick to 2 spaces.
+  If you're using an editor that supports `EditorConfig <http://EditorConfig.org>`_\ , the editor should automatically use the settings defined in Bash-it's `.editorconfig file <.editorconfig>`_.
+* When creating new functions, please use a dash ("-") to separate the words of the function's name, e.g. ``my-new-function``.
+  Don't use underscores, e.g. ``my_new_function``.
+* Internal functions that aren't to be used by the end user should start with an underscore, e.g. ``_my-new-internal-function``.
+* Use the provided meta functions to document your code, e.g. ``about-plugin``\ , ``about``\ , ``group``\ , ``param``\ , ``example``.
+  This will make it easier for other people to use your new functionality.
+  Take a look at the existing code for an example (e.g. `the base plugin <plugins/available/base.plugin.bash>`_\ ).
+* When adding files, please use the existing file naming conventions, e.g. plugin files need to end in ``.plugin.bash``.
+  This is important for the installation functionality.
+* When using the ``$BASH_IT`` variable, please always enclose it in double quotes to ensure that the code also works when Bash-it is installed in a directory that contains spaces in its name: ``for f in "${BASH_IT}/plugins/available"/*.bash ; do echo "$f" ; done``
+* Bash-it supports Bash 3.2 and higher. Please don't use features only available in Bash 4, such as associative arrays.
+
+Unit Tests
+----------
+
+When adding features or making changes/fixes, please run our growing unit test suite to ensure that you did not break existing functionality.
+The test suite does not cover all aspects of Bash-it, but please run it anyway to verify that you did not introduce any regression issues.
+
+Any code pushed to GitHub as part of a Pull Request will automatically trigger a continuous integration build on `Travis CI <https://travis-ci.org/Bash-it/bash-it>`_\ , where the test suite is run on both Linux and macOS.
+The Pull Request will then show the result of the Travis build, indicating whether all tests ran fine, or whether there were issues.
+Please pay attention to this, Pull Requests with build issues will not be merged.
+
+Adding new functionality or changing existing functionality is a good opportunity to increase Bash-it's test coverage.
+When you're changing the Bash-it codebase, please consider adding some unit tests that cover the new or changed functionality.
+Ideally, when fixing a bug, a matching unit test that verifies that the bug is no longer present, is added at the same time.
+
+To run the test suite, simply execute the following in the directory where you cloned Bash-it:
+
+.. code-block:: bash
+
+   test/run
+
+This command will ensure that the `Bats Test Framework <https://github.com/bats-core/bats-core>`_ is available in the local ``test_lib`` directory (Bats is included as a Git submodule) and then run the test suite found in the `test <test>`_ folder.
+The test script will execute each test in turn, and will print a status for each test case.
+
+When adding new test cases, please take a look at the existing test cases for examples.
+
+The following libraries are used to help with the tests:
+
+
+* Test Framework: https://github.com/bats-core/bats-core
+* Support library for Bats-Assert: https://github.com/ztombol/bats-support
+* General ``assert`` functions: https://github.com/ztombol/bats-assert
+* File ``assert`` functions: https://github.com/ztombol/bats-file
+
+When verifying test results, please try to use the ``assert`` functions found in these libraries.
+
+Features
+--------
+
+
+* When adding new completions or plugins, please don't simply copy existing tools into the Bash-it codebase, try to load/integrate the tools instead.
+  An example is using ``nvm``\ : Instead of copying the existing ``nvm`` script into Bash-it, the ``nvm.plugin.bash`` file tries to load an existing installation of ``nvm``.
+  This means an additional step for the user (installing ``nvm`` from its own repo, or through a package manager),
+  but it will also ensure that ``nvm`` can be upgraded in an easy way.
+
+.. _contributing_theme:
+
+Themes
+------
+
+
+* When adding a new theme, please include a screenshot and a short description about what makes this theme unique in the Pull Request's description field.
+  Please do not add theme screenshots to the repo itself, as they will add unnecessary bloat to the repo.
+  The project's Wiki has a *Themes* page where you can add a screenshot if you want.
+* Ideally, each theme's folder should contain a ``README.md`` file describing the theme and its configuration options.
diff --git a/docs/custom.rst b/docs/custom.rst
new file mode 100644
index 00000000..5da41592
--- /dev/null
+++ b/docs/custom.rst
@@ -0,0 +1,18 @@
+.. _custom:
+
+Custom Content
+--------------
+
+For custom scripts, and aliases, just create the following files (they'll be ignored by the git repo):
+
+
+* ``aliases/custom.aliases.bash``
+* ``completion/custom.completion.bash``
+* ``lib/custom.bash``
+* ``plugins/custom.plugins.bash``
+* ``custom/themes/<custom theme name>/<custom theme name>.theme.bash``
+
+Anything in the custom directory will be ignored, with the exception of ``custom/example.bash``.
+
+Alternately, if you would like to keep your custom scripts under version control, you can set ``BASH_IT_CUSTOM`` in your ``~/.bashrc`` to another location outside of the ``$BASH_IT`` folder.
+In this case, any ``*.bash`` file under every directory below ``BASH_IT_CUSTOM`` folder will be used.
diff --git a/docs/development.rst b/docs/development.rst
new file mode 100644
index 00000000..924d189b
--- /dev/null
+++ b/docs/development.rst
@@ -0,0 +1,94 @@
+.. _development:
+
+Bash-it Development
+===================
+
+This page summarizes a couple of rules to keep in mind when developing features or making changes in Bash-it.
+
+Testing
+-------
+
+Make sure to read the :ref:`testing docs<test>`.
+
+Debugging and Logging
+---------------------
+
+General Logging
+^^^^^^^^^^^^^^^
+
+While developing feature or making changes in general, you can log error/warning/debug
+using ``_log_error`` ``_log_warning`` and ``_log_debug``. This will help you solve problems quicker
+and also propagate important notes to other users of Bash-it.
+You can see the logs by using ``bash-it doctor`` command to reload and see the logs.
+Alternatively, you can set ``BASH_IT_LOG_LEVEL`` to ``BASH_IT_LOG_LEVEL_ERROR``\ , ``BASH_IT_LOG_LEVEL_WARNING`` or ``BASH_IT_LOG_LEVEL_ALL``.
+
+Log Prefix/Context
+^^^^^^^^^^^^^^^^^^
+
+You can define ``BASH_IT_LOG_PREFIX`` in your files in order to a have a constant prefix before your logs.
+Note that we prefer to uses "tags" based logging, i.e ``plugins: git: DEBUG: Loading git plugin``.
+
+Load Order
+----------
+
+General Load Order
+^^^^^^^^^^^^^^^^^^
+
+The main ``bash_it.sh`` script loads the frameworks individual components in the following order:
+
+
+* ``lib/composure.bash``
+* Files in ``lib`` with the exception of ``appearance.bash`` - this means that ``composure.bash`` is loaded again here (possible improvement?)
+* Enabled ``aliases``
+* Enabled ``plugins``
+* Enabled ``completions``
+* ``themes/colors.theme.bash``
+* ``themes/base.theme.bash``
+* ``lib/appearance.bash``\ , which loads the selected theme
+* Custom ``aliases``
+* Custom ``plugins``
+* Custom ``completions``
+* Additional custom files from either ``$BASH_IT/custom`` or ``$BASH_IT_CUSTOM``
+
+This order is subject to change.
+
+Individual Component Load Order
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For ``aliases``\ , ``plugins`` and ``completions``\ , the following rules are applied that influence the load order:
+
+
+* There is a global ``enabled`` directory, which the enabled components are linked into. Enabled plugins are symlinked from ``$BASH_IT/plugins/available`` to ``$BASH_IT/enabled`` for example. All component types are linked into the same common ``$BASH_IT/enabled`` directory.
+* Within the common ``enabled`` directories, the files are loaded in alphabetical order, which is based on the item's load priority (see next item).
+* When enabling a component, a *load priority* is assigned to the file. The following default priorities are used:
+
+  * Aliases: 150
+  * Plugins: 250
+  * Completions: 350
+
+* When symlinking a component into the ``enabled`` directory, the load priority is used as a prefix for the linked name, separated with three dashes from the name of the component. The ``node.plugin.bash`` would be symlinked to ``250---node.plugin.bash`` for example.
+*
+  Each file can override the default load priority by specifying a new value. To do this, the file needs to include a comment in the following form. This example would cause the ``node.plugin.bash`` (if included in that file) to be linked to ``225---node.plugin.bash``\ :
+
+  .. code-block:: bash
+
+     # BASH_IT_LOAD_PRIORITY: 225
+
+Having the order based on a numeric priority in a common directory allows for more flexibility. While in general, aliases are loaded first (since their default priority is 150), it's possible to load some aliases after the plugins, or some plugins after completions by setting the items' load priority. This is more flexible than a fixed type-based order or a strict alphabetical order based on name.
+
+These items are subject to change. When making changes to the internal functionality, this page needs to be updated as well.
+
+Plugin Disable Callbacks
+------------------------
+
+Plugins can define a function that will be called when the plugin is being disabled.
+The callback name should be ``{PLUGIN_NAME}_on_disable``\ , you can see ``gitstatus`` for usage example.
+
+Using the pre-commit hook
+-------------------------
+
+Note the file .pre-commit-config.yaml at the top of the repo.
+This file configures the behavior of the a pre-commit hook based on `the Pre-Commit framework <https://pre-commit.com/>`_. Please see the site about
+installing it (with pip, brew or other tools) then run ``pre-commit install`` in the repo's root to activate the hook.
+For the full use of the tool, you may need to install also other third-party tools, such as
+`shellcheck <https://github.com/koalaman/shellcheck/>`_ and `shfmt <https://github.com/mvdan/sh>`_.
diff --git a/docs/index.rst b/docs/index.rst
index d70cf6de..7f4649e7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,14 +1,42 @@
+
 Welcome to Bash-it's documentation!
 ===================================
 
+**Bash-it** is a collection of community Bash commands and scripts for Bash 3.2+.
+(And a shameless ripoff of `oh-my-zsh <https://github.com/robbyrussell/oh-my-zsh>`_)
+
+Includes autocompletion, themes, aliases, custom functions, a few stolen pieces from Steve Losh, and more.
+
+Bash-it provides a solid framework for using, developing and maintaining shell scripts and custom commands for your daily work.
+If you're using the *Bourne Again Shell* (Bash) regularly and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!
+Stop polluting your ``~/bin`` directory and your ``.bashrc`` file, fork/clone Bash-it and start hacking away.
+
 .. toctree::
-   :maxdepth: 2
-   :caption: Contents:
+   :maxdepth: 1
+
+   contributing
+   development
+   test
+   installation
+   commands/index
+   custom
+   themes
+   vcs_user
+   misc
+   uninstalling
 
 
+Help out
+--------
 
-Indices and tables
-==================
+We think everyone has their own custom scripts accumulated over time.
+And so, following in the footsteps of oh-my-zsh, Bash-it is a framework for easily customizing your Bash shell.
+Everyone's got a custom toolbox, so let's start making them even better, **as a community!**
 
-* :ref:`genindex`
-* :ref:`search`
+Send us a pull request and we'll merge it as long as it looks good.
+If you change an existing command, please give an explanation why.
+That will help a lot when we merge your changes in.
+
+Please take a look at the :ref:`Contribution Guidelines <contributing>` before reporting a bug or providing a new feature.
+
+Thanks, and happing bashing!
diff --git a/docs/installation.rst b/docs/installation.rst
new file mode 100644
index 00000000..12cc9437
--- /dev/null
+++ b/docs/installation.rst
@@ -0,0 +1,57 @@
+.. _installation:
+
+Installation
+------------
+
+
+#. Check out a clone of this repo to a location of your choice, such as
+   ``git clone --depth=1 https://github.com/Bash-it/bash-it.git ~/.bash_it``
+#. Run ``~/.bash_it/install.sh`` (it automatically backs up your ``~/.bash_profile`` or ``~/.bashrc``\ , depending on your OS)
+#. Edit your modified config (\ ``~/.bash_profile`` or ``~/.bashrc``\ ) file in order to customize Bash-it.
+#. Check out available aliases, completions, and plugins and enable the ones you want to use (see the next section for more details).
+
+Install Options
+^^^^^^^^^^^^^^^
+
+The install script can take the following options:
+
+
+* ``--interactive``\ : Asks the user which aliases, completions and plugins to enable.
+* ``--silent``\ : Ask nothing and install using default settings.
+* ``--no-modify-config``\ : Do not modify the existing config file (\ ``~/.bash_profile`` or ``~/.bashrc``\ ).
+
+When run without the ``--interactive`` switch, Bash-it only enables a sane default set of functionality to keep your shell clean and to avoid issues with missing dependencies.
+Feel free to enable the tools you want to use after the installation.
+
+When you run without the ``--no-modify-config`` switch, the Bash-it installer automatically modifies/replaces your existing config file.
+Use the ``--no-modify-config`` switch to avoid unwanted modifications, e.g. if your Bash config file already contains the code that loads Bash-it.
+
+**NOTE**\ : Keep in mind how Bash loads its configuration files,
+``.bash_profile`` for login shells (and in macOS in terminal emulators like `Terminal.app <http://www.apple.com/osx/apps/>`_ or
+`iTerm2 <https://www.iterm2.com/>`_\ ) and ``.bashrc`` for interactive shells (default mode in most of the GNU/Linux terminal emulators),
+to ensure that Bash-it is loaded correctly.
+A good "practice" is sourcing ``.bashrc`` into ``.bash_profile`` to keep things working in all the scenarios.
+To achieve this, you can add this snippet in your ``.bash_profile``\ :
+
+.. code-block::
+
+   if [ -f ~/.bashrc ]; then
+     . ~/.bashrc
+   fi
+
+Refer to the official `Bash documentation <https://www.gnu.org/software/bash/manual/bashref.html#Bash-Startup-Files>`_ to get more info.
+
+Install using Docker
+^^^^^^^^^^^^^^^^^^^^
+
+You can try Bash-it in an isolated environment without changing any local files via a `Docker <https://www.docker.com/>`_ Container.
+(Bash Shell v4.4 with Bash-it, `bats <https://github.com/sstephenson/bats>`_\ ,and bash-completion based on `Alpine Linux <https://alpinelinux.org/>`_\ ).
+
+``docker pull ellerbrock/bash-it``
+
+Have a look at our `bash-it-docker repository <https://github.com/Bash-it/bash-it-docker>`_ for further information.
+
+Updating
+^^^^^^^^
+
+See :ref:`update command <update>`.
diff --git a/docs/misc.rst b/docs/misc.rst
new file mode 100644
index 00000000..c576d926
--- /dev/null
+++ b/docs/misc.rst
@@ -0,0 +1,76 @@
+.. _misc:
+
+Misc
+----
+
+Help Screens
+^^^^^^^^^^^^
+
+.. code-block:: bash
+
+   bash-it show aliases        # shows installed and available aliases
+   bash-it show completions    # shows installed and available completions
+   bash-it show plugins        # shows installed and available plugins
+   bash-it help aliases        # shows help for installed aliases
+   bash-it help completions    # shows help for installed completions
+   bash-it help plugins        # shows help for installed plugins
+
+Pass function renamed to passgen
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The Bash-it ``pass`` function has been renamed to ``passgen`` in order to avoid a naming conflict with the `pass password manager <https://www.passwordstore.org/>`_.
+In order to minimize the impact on users of the legacy Bash-it ``pass`` function, Bash-it will create the alias ``pass`` that calls the new ``passgen`` function if the ``pass`` password manager command is not found on the ``PATH`` (default behavior).
+
+This behavior can be overridden with the ``BASH_IT_LEGACY_PASS`` flag as follows:
+
+Set ``BASH_IT_LEGACY_PASS`` to 'true' to force Bash-it to always **create** the ``pass`` alias to ``passgen``\ :
+
+
+* ``export BASH_IT_LEGACY_PASS=true``
+
+Unset ``BASH_IT_LEGACY_PASS`` to have Bash-it **return to default behavior**\ :
+
+
+* ``unset BASH_IT_LEGACY_PASS``
+
+Proxy Support
+^^^^^^^^^^^^^
+
+If you are working in a corporate environment where you have to go through a proxy server for internet access,
+then you know how painful it is to configure the OS proxy variables in the shell,
+especially if you are switching between environments, e.g. office (with proxy) and home (without proxy).
+
+The Bash shell (and many shell tools) use the following variables to define the proxy to use:
+
+
+* ``HTTP_PROXY`` (and ``http_proxy``\ ): Defines the proxy server for HTTP requests
+* ``HTTPS_PROXY`` (and ``https_proxy``\ ): Defines the proxy server for HTTPS requests
+* ``ALL_PROXY`` (and ``all_proxy``\ ): Used by some tools for the same purpose as above
+* ``NO_PROXY`` (and ``no_proxy``\ ): Comma-separated list of hostnames that don't have to go through the proxy
+
+Bash-it's ``proxy`` plugin allows to enable and disable these variables with a simple command.
+To start using the ``proxy`` plugin, run the following:
+
+.. code-block:: bash
+
+   bash-it enable plugin proxy
+
+Bash-it also provides support for enabling/disabling proxy settings for various shell tools.
+The following backends are currently supported (in addition to the shell's environment variables): Git, SVN, npm, ssh.
+The ``proxy`` plugin changes the configuration files of these tools to enable or disable the proxy settings.
+
+Bash-it uses the following variables to set the shell's proxy settings when you call ``enable-proxy``.
+These variables are best defined in a custom script in Bash-it's custom script folder (\ ``$BASH_IT/custom``\ ), e.g. ``$BASH_IT/custom/proxy.env.bash``
+
+
+* ``BASH_IT_HTTP_PROXY`` and `BASH_IT_HTTPS_PROXY`: Define the proxy URL to be used, e.g. 'http://localhost:1234'
+* ``BASH_IT_NO_PROXY``\ : A comma-separated list of proxy exclusions, e.g. ``127.0.0.1,localhost``
+
+Once you have defined these variables (and have run ``reload`` to load the changes), you can use the following commands to enable or disable the proxy settings in your current shell:
+
+
+* ``enable-proxy``\ : This sets the shell's proxy environment variables and configures proxy support in your SVN, npm, and SSH configuration files.
+* ``disable-proxy``\ : This unsets the shell's proxy environment variables and disables proxy support in your SVN, npm, and SSH configuration files.
+
+There are many more proxy commands, e.g. for changing the local Git project's proxy settings.
+Run ``glossary proxy`` to show the available proxy functions with a short description.
diff --git a/docs/test.rst b/docs/test.rst
new file mode 100644
index 00000000..8f616560
--- /dev/null
+++ b/docs/test.rst
@@ -0,0 +1,46 @@
+.. _test:
+
+Testing Bash-it
+===============
+
+Overview
+--------
+
+The Bash-it unit tests leverage the `Bats unit test framework for Bash <https://github.com/bats-core/bats-core>`_.
+There is no need to install Bats explicitly, the test run script will automatically download and install Bats and its dependencies.
+
+When making changes to Bash-it, the tests are automatically executed in a test build environment on `Travis CI <https://travis-ci.com>`_.
+
+Test Execution
+--------------
+
+To execute the unit tests, please run the ``run`` script:
+
+.. code-block:: bash
+
+   # If you are in the `test` directory:
+   ./run
+
+   # If you are in the root `.bash_it` directory:
+   test/run
+
+The ``run`` script will automatically install if it is not already present, and will then run all tests found under the ``test`` directory, including subdirectories.
+
+To run only a subset of the tests, you can provide the name of the test subdirectory that you want to run, e.g. like this for the tests in the ``test/themes`` directory:
+
+.. code-block:: bash
+
+   # If you are in the root `.bash_it` directory:
+   test/run test/themes
+
+By default, the tests run in single-threaded mode.
+If you want to speed up the test execution, you can install the `GNU ``parallel`` tool <https://www.gnu.org/software/parallel/>`_\ , which is supported by Bats.
+When using ``parallel``\ , the ``test/run`` script will use a number of threads in parallel, depending on the available CPU cores of your system.
+This can speed up test execution significantly.
+
+Writing Tests
+-------------
+
+When adding or modifying tests, please stick to the format and conventions of the existing test cases.
+The ``test_helper.bash`` script provides a couple of reusable helper functions that you should use when writing a test case,
+for example for setting up an isolated test environment.
diff --git a/docs/themes.rst b/docs/themes.rst
new file mode 100644
index 00000000..27b93a29
--- /dev/null
+++ b/docs/themes.rst
@@ -0,0 +1,35 @@
+.. _themes:
+
+Themes
+------
+
+There are over 50+ Bash-it themes to pick from in ``$BASH_IT/themes``.
+The default theme is ``bobby``.
+Set ``BASH_IT_THEME`` to the theme name you want, or if you've developed your own custom theme outside of ``$BASH_IT/themes``\ ,
+point the ``BASH_IT_THEME`` variable directly to the theme file.
+To disable theming completely, leave the variable empty.
+
+Examples:
+
+.. code-block:: bash
+
+   # Use the "powerline-multiline" theme
+   export BASH_IT_THEME="powerline-multiline"
+
+   # Use a theme outside of the Bash-it folder
+   export BASH_IT_THEME="/home/foo/my_theme/my_theme.theme.bash"
+
+   # Disable theming
+   export BASH_IT_THEME=""
+
+You can easily preview the themes in your own shell using ``BASH_PREVIEW=true bash-it reload``.
+
+If you've created your own custom prompts, we'd love it if you shared them with everyone else! Just submit a Pull Request.
+You can see theme screenshots on `wiki/Themes <https://github.com/Bash-it/bash-it/wiki/Themes>`_.
+
+**NOTE**\ : Bash-it and some themes use UTF-8 characters, so to avoid strange behavior in your terminal, set your locale to ``LC_ALL=en_US.UTF-8`` or the equivalent to your language if it isn't American English.
+
+Contributing a new theme
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+See the :ref:`instructions <contributing_theme>`.
diff --git a/docs/uninstalling.rst b/docs/uninstalling.rst
new file mode 100644
index 00000000..dab1430d
--- /dev/null
+++ b/docs/uninstalling.rst
@@ -0,0 +1,14 @@
+.. _uninstalling:
+
+Uninstalling
+------------
+
+To uninstall Bash-it, run the ``uninstall.sh`` script found in the ``$BASH_IT`` directory:
+
+.. code-block::
+
+   cd $BASH_IT
+   ./uninstall.sh
+
+This will restore your previous Bash profile.
+After the uninstall script finishes, remove the Bash-it directory from your machine (\ ``rm -rf $BASH_IT``\ ) and start a new shell.
diff --git a/docs/vcs_user.rst b/docs/vcs_user.rst
new file mode 100644
index 00000000..c876f584
--- /dev/null
+++ b/docs/vcs_user.rst
@@ -0,0 +1,198 @@
+.. _vcs_user:
+
+Prompt Version Control Information
+==================================
+
+Bash-it provides prompt :ref:`themes` with the ability to check and display version control information for the current directory.
+The information is retrieved for each directory and can slow down the navigation of projects with a large number of files and folders.
+Turn version control checking off to prevent slow directory navigation within large projects.
+
+Controlling Flags
+^^^^^^^^^^^^^^^^^
+
+Bash-it provides a flag (\ ``SCM_CHECK``\ ) within the ``~/.bash_profile`` file that turns off/on version control information checking and display within all themes.
+Version control checking is on by default unless explicitly turned off.
+
+Set ``SCM_CHECK`` to 'false' to **turn off** version control checks for all themes:
+
+
+* ``export SCM_CHECK=false``
+
+Set ``SCM_CHECK`` to 'true' (the default value) to **turn on** version control checks for all themes:
+
+
+* ``export SCM_CHECK=true``
+
+**NOTE:**
+It is possible for themes to ignore the ``SCM_CHECK`` flag and query specific version control information directly.
+For example, themes that use functions like ``git_prompt_vars`` skip the ``SCM_CHECK`` flag to retrieve and display git prompt information.
+If you turned version control checking off and you still see version control information within your prompt, then functions like ``git_prompt_vars`` are most likely the reason why.
+
+Git prompt
+^^^^^^^^^^
+
+Bash-it has some nice features related to Git, continue reading to know more about these features.
+
+Repository info in the prompt
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Bash-it can show some information about Git repositories in the shell prompt: the current branch, tag or commit you are at, how many commits the local branch is ahead or behind from the remote branch, and if you have changes stashed.
+
+Additionally, you can view the status of your working copy and get the count of *staged*\ , *unstaged* and *untracked* files.
+This feature is controlled through the flag ``SCM_GIT_SHOW_DETAILS`` as follows:
+
+Set ``SCM_GIT_SHOW_DETAILS`` to 'true' (the default value) to **show** the working copy details in your prompt:
+
+
+* ``export SCM_GIT_SHOW_DETAILS=true``
+
+Set ``SCM_GIT_SHOW_DETAILS`` to 'false' to **don't show** it:
+
+
+* ``export SCM_GIT_SHOW_DETAILS=false``
+
+**NOTE:** If using ``SCM_GIT_SHOW_MINIMAL_INFO=true``\ , then the value of ``SCM_GIT_SHOW_DETAILS`` is ignored.
+
+Remotes and remote branches
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In some git workflows, you must work with various remotes, for this reason, Bash-it can provide some useful information about your remotes and your remote branches, for example, the remote on you are working, or if your local branch is tracking a remote branch.
+
+You can control this feature with the flag ``SCM_GIT_SHOW_REMOTE_INFO`` as follows:
+
+Set ``SCM_GIT_SHOW_REMOTE_INFO`` to 'auto' (the default value) to activate it only when more than one remote is configured in the current repo:
+
+
+* ``export SCM_GIT_SHOW_REMOTE_INFO=auto``
+
+Set ``SCM_GIT_SHOW_REMOTE_INFO`` to 'true' to always activate the feature:
+
+
+* ``export SCM_GIT_SHOW_REMOTE_INFO=true``
+
+Set ``SCM_GIT_SHOW_REMOTE_INFO`` to 'false' to **disable the feature**\ :
+
+
+* ``export SCM_GIT_SHOW_REMOTE_INFO=false``
+
+**NOTE:** If using ``SCM_GIT_SHOW_MINIMAL_INFO=true``\ , then the value of ``SCM_GIT_SHOW_REMOTE_INFO`` is ignored.
+
+Untracked files
+^^^^^^^^^^^^^^^
+
+By default, the ``git status`` command shows information about *untracked* files.
+This behavior can be controlled through command-line flags or git configuration files.
+For big repositories, ignoring *untracked* files can make git faster.
+Bash-it uses ``git status`` to gather the repo information it shows in the prompt, so in some circumstances, it can be useful to instruct Bash-it to ignore these files.
+You can control this behavior with the flag ``SCM_GIT_IGNORE_UNTRACKED``\ :
+
+Set ``SCM_GIT_IGNORE_UNTRACKED`` to 'false' (the default value) to get information about *untracked* files:
+
+
+* ``export SCM_GIT_IGNORE_UNTRACKED=false``
+
+Set ``SCM_GIT_IGNORE_UNTRACKED`` to 'true' to **ignore** *untracked* files:
+
+
+* ``export SCM_GIT_IGNORE_UNTRACKED=true``
+
+Also, with this flag to false, Bash-it will not show the repository as dirty when the repo has *untracked* files, and will not display the count of *untracked* files.
+
+**NOTE:** If you set in git configuration file the option to ignore *untracked* files, this flag has no effect, and Bash-it will ignore *untracked* files always.
+
+Stash item count
+^^^^^^^^^^^^^^^^
+
+When ``SCM_GIT_SHOW_DETAILS`` is enabled, you can get the count of *stashed* items. This feature can be useful when a user has a lot of stash items.
+This feature is controlled through the flag ``SCM_GIT_SHOW_STASH_INFO`` as follows:
+
+Set ``SCM_GIT_SHOW_STASH_INFO`` to 'true' (the default value) to **show** the count of stashed items:
+
+
+* ``export SCM_GIT_SHOW_STASH_INFO=true``
+
+Set ``SCM_GIT_SHOW_STASH_INFO`` to 'false' to **don't show** it:
+
+
+* ``export SCM_GIT_SHOW_STASH_INFO=false``
+
+Ahead/Behind Count
+^^^^^^^^^^^^^^^^^^
+
+When displaying information regarding whether or not the local branch is ahead or behind its remote counterpart, you can opt to display the number of commits ahead/behind.
+This is useful if you only care whether or not you are ahead or behind and do not care how far ahead/behind you are.
+
+Set ``SCM_GIT_SHOW_COMMIT_COUNT`` to 'true' (the default value) to **show** the count of commits ahead/behind:
+
+
+* ``export SCM_GIT_SHOW_COMMIT_COUNT=true``
+
+Set ``SCM_GIT_SHOW_COMMIT_COUNT`` to 'false' to **don't show** it:
+
+
+* ``export SCM_GIT_SHOW_COMMIT_COUNT=false``
+
+Git user
+^^^^^^^^
+
+In some environments, it is useful to know the value of the current git user, which is used to mark all new commits.
+For example, any organization that uses the practice of pair programming will typically author each commit with `combined names of the two authors <https://github.com/pivotal/git_scripts>`_.
+When another pair uses the same pairing station, the authors are changed at the beginning of the session.
+
+To get up and running with this technique, run ``gem install pivotal_git_scripts``\ , and then edit your ``~/.pairs`` file, according to the specification on the `gem's homepage <https://github.com/pivotal/git_scripts>`_.
+After that, you should be able to run ``git pair kg as`` to set the author to, eg. "Konstantin Gredeskoul and Alex Saxby", assuming they've been added to the ``~/.pairs`` file.
+Please see gem's documentation for more information.
+
+To enable the display of the current pair in the prompt, you must set ``SCM_GIT_SHOW_CURRENT_USER`` to ``true``.
+Once set, the ``SCM_CURRENT_USER`` variable will be automatically populated with the initials of the git author(s).
+It will also be included in the default git prompt.
+Even if you do not have ``git pair`` installed, as long as your ``user.name`` is set, your initials will be computed from your name and shown in the prompt.
+
+You can control the prefix and the suffix of this component using the two variables:
+
+
+* ``export SCM_THEME_CURRENT_USER_PREFFIX=' ☺︎ '``
+
+And
+
+
+* ``export SCM_THEME_CURRENT_USER_SUFFIX=' ☺︎ '``
+
+**NOTE:** If using ``SCM_GIT_SHOW_MINIMAL_INFO=true``\ , then the value of ``SCM_GIT_SHOW_CURRENT_USER`` is ignored.
+
+Git show minimal status info
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To speed up the prompt while still getting minimal git status information displayed such as the value of ``HEAD`` and whether there are any dirty objects, you can set:
+
+.. code-block::
+
+   export SCM_GIT_SHOW_MINIMAL_INFO=true
+
+Ignore repo status
+^^^^^^^^^^^^^^^^^^
+
+When working in repos with a large codebase, Bash-it can slow down your prompt when checking the repo status.
+To avoid it, there is an option you can set via Git config to disable checking repo status in Bash-it.
+
+To disable checking the status in the current repo:
+
+.. code-block::
+
+   $ git config --add bash-it.hide-status 1
+
+But if you would like to disable it globally, and stop checking the status for all of your repos:
+
+.. code-block::
+
+   $ git config --global --add bash-it.hide-status 1
+
+Setting this flag globally has the same effect as ``SCM_CHECK=true``\ , but only for Git repos.
+
+Speed up git status calculations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+As an alternative to ignoring repo status entirely, you can try out the ``gitstatus`` plugin.
+This plugin speeds up all ``git status`` calculations by up to 10x times!
+
+**NOTE**\ : You will need to clone ``gitstatus`` repo from `here <https://github.com/romkatv/gitstatus>`_.

From 122841865342051e0bcd3f8f70ce5edcf4068d27 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 25 Oct 2020 14:59:22 +0200
Subject: [PATCH 348/388] docs: Change theme to sphinx rtd theme

---
 docs/conf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index af4615e5..d11bc0a3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,6 +31,7 @@ release = ''
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'sphinx_rtd_theme'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -47,7 +48,7 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'alabaster'
+html_theme = 'sphinx_rtd_theme'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

From 3844b652b4eba92fa25e133632c3561515622272 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 25 Oct 2020 14:59:36 +0200
Subject: [PATCH 349/388] Add readthedocs configuration

---
 .readthedocs.yml      | 10 ++++++++++
 docs/requirements.txt |  2 ++
 2 files changed, 12 insertions(+)
 create mode 100644 .readthedocs.yml
 create mode 100644 docs/requirements.txt

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 00000000..751f3175
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,10 @@
+version: 2
+
+sphinx:
+  builder: htmldir
+  configuration: docs/conf.py
+
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 00000000..36a96b36
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,2 @@
+sphinx == 3.2.1
+sphinx-rtd-theme==0.5.0

From 0076db0efb1113a96a0a452f9132e0ede3ed7098 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 28 Oct 2020 09:14:08 +0200
Subject: [PATCH 350/388] docs: Add CI stage

---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0a2dd357..8f96e2aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,15 @@ cache:
 
 jobs:
   include:
+  - language: python
+    python: 3.8
+    name: docs
+    dist: bionic
+    install:
+      pip3 install -r docs/requirements.txt;
+    script:
+      sphinx-build -W -b html docs docs/_build/html;
+
   - language: go
     go: "1.14"
     name: pre-commit lint

From a717283163841bfc558ac0608cde2241ae0867cb Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 31 Oct 2020 23:02:09 +0200
Subject: [PATCH 351/388] docs: Add label to git_prompt section

---
 docs/vcs_user.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/vcs_user.rst b/docs/vcs_user.rst
index c876f584..c6d31a57 100644
--- a/docs/vcs_user.rst
+++ b/docs/vcs_user.rst
@@ -28,6 +28,8 @@ It is possible for themes to ignore the ``SCM_CHECK`` flag and query specific ve
 For example, themes that use functions like ``git_prompt_vars`` skip the ``SCM_CHECK`` flag to retrieve and display git prompt information.
 If you turned version control checking off and you still see version control information within your prompt, then functions like ``git_prompt_vars`` are most likely the reason why.
 
+.. _git_prompt:
+
 Git prompt
 ^^^^^^^^^^
 

From 9edba505b5263cfab4f6ac97832834b93c624439 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 3 Nov 2020 09:16:14 -0800
Subject: [PATCH 352/388] Adds better support for .bat files; Fixes
 docs/make.bat

---
 .gitattributes          |  3 ++
 .pre-commit-config.yaml |  1 +
 docs/make.bat           | 70 ++++++++++++++++++++---------------------
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index d4c710cb..bb7d1461 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
 *.sh text eol=lf
 *.bash text eol=lf
+
+# Windows files
+*.bat text eol=crlf
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0a7ab794..0bd696da 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -25,3 +25,4 @@ repos:
     hooks:
       # - id: forbid-crlf
       - id: remove-crlf
+        exclude: ".bat$"
diff --git a/docs/make.bat b/docs/make.bat
index 2119f510..922152e9 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -1,35 +1,35 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=.
-set BUILDDIR=_build
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-
-:end
-popd
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd

From da9b7100144c3ada2ec24e35aa3038429b96678c Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 3 Nov 2020 10:10:11 -0800
Subject: [PATCH 353/388] Moves lint logic into lint_clean_files.sh

---
 .travis.yml         | 2 +-
 clean_files.txt     | 1 +
 lint_clean_files.sh | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 lint_clean_files.sh

diff --git a/.travis.yml b/.travis.yml
index 8f96e2aa..d199e9d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ jobs:
       GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt;
       curl https://pre-commit.com/install-local.py | python3 -
     script:
-      pre-commit run --files `cat clean_files.txt`;
+      ./lint_clean_files.sh;
 
   - <<: *native_job
     name: Ubuntu 16.04
diff --git a/clean_files.txt b/clean_files.txt
index f0f8457e..32cede56 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -1 +1,2 @@
+lint_clean_files.sh
 themes/90210/90210.theme.bash
diff --git a/lint_clean_files.sh b/lint_clean_files.sh
new file mode 100755
index 00000000..a6d3cb92
--- /dev/null
+++ b/lint_clean_files.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Pull list of checkable files from clean_files.txt
+#
+mapfile -t FILES < clean_files.txt
+
+pre-commit run --files "${FILES[@]}"

From a858e75456097507b4ca17a15bed46c165ae8d8d Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 3 Nov 2020 16:14:02 -0800
Subject: [PATCH 354/388] Add Dir Support to Clean_Files; Clean powerline theme

---
 clean_files.txt                       |  29 +-
 lint_clean_files.sh                   |  13 +-
 themes/powerline/powerline.base.bash  | 416 +++++++++++++-------------
 themes/powerline/powerline.theme.bash |   1 +
 4 files changed, 247 insertions(+), 212 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index 32cede56..0276d20b 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -1,2 +1,29 @@
+#######################################################################
+# Allow-list of files to be lint-checked by CI
+#
+# Directory Suport
+#   Directory references are allowed within the file, ie:
+#
+#       themes/powerline
+#
+#   All files under the referenced directory will be checked
+#
+# Checking Files Locally
+#   You can manually invoke the check via:
+#
+#       lint_clean_files.sh
+#
+
+# root directories
+#
+docs
+
+# root files
+#
+.gitattributes
 lint_clean_files.sh
-themes/90210/90210.theme.bash
+
+# themes
+#
+themes/90210
+themes/powerline
diff --git a/lint_clean_files.sh b/lint_clean_files.sh
index a6d3cb92..bd34540a 100755
--- a/lint_clean_files.sh
+++ b/lint_clean_files.sh
@@ -1,7 +1,16 @@
 #!/usr/bin/env bash
 
 # Pull list of checkable files from clean_files.txt
+#  - Folder references are allowed
+#  - Empty lines are ignored
+#  - Comment lines (#) are ignored
 #
-mapfile -t FILES < clean_files.txt
+# shellcheck disable=SC2002  # Prefer 'cat' for cleaner script
+mapfile -t FILES < <(
+	cat clean_files.txt \
+		| grep -v -E '^\s*$' \
+		| grep -v -E '^\s*#' \
+		| xargs -n1 -I{} find "{}" -type f
+)
 
-pre-commit run --files "${FILES[@]}"
+BASH_IT='' pre-commit run --files "${FILES[@]}"
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 3655e851..b2596793 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -1,282 +1,280 @@
 # Define this here so it can be used by all of the Powerline themes
 THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true}
 
-function set_color {
-  set +u
-  if [[ "${1}" != "-" ]]; then
-    fg="38;5;${1}"
-  fi
-  if [[ "${2}" != "-" ]]; then
-    bg="48;5;${2}"
-    [[ -n "${fg}" ]] && bg=";${bg}"
-  fi
-  echo -e "\[\033[${fg}${bg}m\]"
+function set_color() {
+	set +u
+	if [[ "${1}" != "-" ]]; then
+		fg="38;5;${1}"
+	fi
+	if [[ "${2}" != "-" ]]; then
+		bg="48;5;${2}"
+		[[ -n "${fg}" ]] && bg=";${bg}"
+	fi
+	echo -e "\[\033[${fg}${bg}m\]"
 }
 
-function __powerline_user_info_prompt {
-  local user_info=""
-  local color=${USER_INFO_THEME_PROMPT_COLOR}
+function __powerline_user_info_prompt() {
+	local user_info=""
+	local color=${USER_INFO_THEME_PROMPT_COLOR}
 
-  if [[ "${THEME_CHECK_SUDO}" = true ]]; then
-    sudo -vn 1>/dev/null 2>&1 && color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
-  fi
+	if [[ "${THEME_CHECK_SUDO}" = true ]]; then
+		sudo -vn 1> /dev/null 2>&1 && color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
+	fi
 
-  case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
-    "sudo")
-      if [[ "${color}" = "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
-        user_info="!"
-      fi
-      ;;
-    *)
-      local user=${SHORT_USER:-${USER}}
-      if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
-        user_info="${USER_INFO_SSH_CHAR}${user}"
-      else
-        user_info="${user}"
-      fi
-      ;;
-  esac
-  [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
+	case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
+		"sudo")
+			if [[ "${color}" = "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
+				user_info="!"
+			fi
+			;;
+		*)
+			local user=${SHORT_USER:-${USER}}
+			if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
+				user_info="${USER_INFO_SSH_CHAR}${user}"
+			else
+				user_info="${user}"
+			fi
+			;;
+	esac
+	[[ -n "${user_info}" ]] && echo "${user_info}|${color}"
 }
 
-function __powerline_terraform_prompt {
-  local terraform_workspace=""
+function __powerline_terraform_prompt() {
+	local terraform_workspace=""
 
-  if [ -d .terraform ]; then
-    terraform_workspace="$(terraform_workspace_prompt)"
-    [[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR}"
-  fi
+	if [ -d .terraform ]; then
+		terraform_workspace="$(terraform_workspace_prompt)"
+		[[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR}"
+	fi
 }
 
-function __powerline_node_prompt {
-  local node_version=""
+function __powerline_node_prompt() {
+	local node_version=""
 
-  node_version="$(node_version_prompt)"
-  [[ -n "${node_version}" ]] && echo "${NODE_CHAR}${node_version}|${NODE_THEME_PROMPT_COLOR}"
+	node_version="$(node_version_prompt)"
+	[[ -n "${node_version}" ]] && echo "${NODE_CHAR}${node_version}|${NODE_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_ruby_prompt {
-  local ruby_version=""
+function __powerline_ruby_prompt() {
+	local ruby_version=""
 
-  if _command_exists rvm; then
-    ruby_version="$(rvm_version_prompt)"
-  elif _command_exists rbenv; then
-    ruby_version=$(rbenv_version_prompt)
-  fi
+	if _command_exists rvm; then
+		ruby_version="$(rvm_version_prompt)"
+	elif _command_exists rbenv; then
+		ruby_version=$(rbenv_version_prompt)
+	fi
 
-  [[ -n "${ruby_version}" ]] && echo "${RUBY_CHAR}${ruby_version}|${RUBY_THEME_PROMPT_COLOR}"
+	[[ -n "${ruby_version}" ]] && echo "${RUBY_CHAR}${ruby_version}|${RUBY_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_k8s_context_prompt {
-  local kubernetes_context=""
+function __powerline_k8s_context_prompt() {
+	local kubernetes_context=""
 
-  if _command_exists kubectl; then
-    kubernetes_context="$(k8s_context_prompt)"
-  fi
+	if _command_exists kubectl; then
+		kubernetes_context="$(k8s_context_prompt)"
+	fi
 
-  [[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR}"
+	[[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_python_venv_prompt {
-  set +u
-  local python_venv=""
+function __powerline_python_venv_prompt() {
+	set +u
+	local python_venv=""
 
-  if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-    python_venv="${CONDA_DEFAULT_ENV}"
-    PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
-  elif [[ -n "${VIRTUAL_ENV}" ]]; then
-    python_venv=$(basename "${VIRTUAL_ENV}")
-  fi
+	if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+		python_venv="${CONDA_DEFAULT_ENV}"
+		PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
+	elif [[ -n "${VIRTUAL_ENV}" ]]; then
+		python_venv=$(basename "${VIRTUAL_ENV}")
+	fi
 
-  [[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
+	[[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_scm_prompt {
-  local color=""
-  local scm_prompt=""
+function __powerline_scm_prompt() {
+	local color=""
+	local scm_prompt=""
 
-  scm_prompt_vars
+	scm_prompt_vars
 
-  if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
-    if [[ "${SCM_DIRTY}" -eq 3 ]]; then
-      color=${SCM_THEME_PROMPT_STAGED_COLOR}
-    elif [[ "${SCM_DIRTY}" -eq 2 ]]; then
-      color=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
-    elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
-      color=${SCM_THEME_PROMPT_DIRTY_COLOR}
-    else
-      color=${SCM_THEME_PROMPT_CLEAN_COLOR}
-    fi
-    if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-    elif [[ "${SCM_P4_CHAR}" == "${SCM_CHAR}" ]]; then
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-    elif [[ "${SCM_HG_CHAR}" == "${SCM_CHAR}" ]]; then
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-    elif [[ "${SCM_SVN_CHAR}" == "${SCM_CHAR}" ]]; then
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-    fi
-    echo "$(eval "echo ${scm_prompt}")${scm}|${color}"
-  fi
+	if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
+		if [[ "${SCM_DIRTY}" -eq 3 ]]; then
+			color=${SCM_THEME_PROMPT_STAGED_COLOR}
+		elif [[ "${SCM_DIRTY}" -eq 2 ]]; then
+			color=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
+		elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
+			color=${SCM_THEME_PROMPT_DIRTY_COLOR}
+		else
+			color=${SCM_THEME_PROMPT_CLEAN_COLOR}
+		fi
+		if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+		elif [[ "${SCM_P4_CHAR}" == "${SCM_CHAR}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+		elif [[ "${SCM_HG_CHAR}" == "${SCM_CHAR}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+		elif [[ "${SCM_SVN_CHAR}" == "${SCM_CHAR}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+		fi
+		echo "$(eval "echo ${scm_prompt}")${scm}|${color}"
+	fi
 }
 
-function __powerline_cwd_prompt {
-  local cwd=$(pwd | sed "s|^${HOME}|~|")
+function __powerline_cwd_prompt() {
+	local cwd=$(pwd | sed "s|^${HOME}|~|")
 
-  echo "${cwd}|${CWD_THEME_PROMPT_COLOR}"
+	echo "${cwd}|${CWD_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_hostname_prompt {
-    echo "${SHORT_HOSTNAME:-$(hostname -s)}|${HOST_THEME_PROMPT_COLOR}"
+function __powerline_hostname_prompt() {
+	echo "${SHORT_HOSTNAME:-$(hostname -s)}|${HOST_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_wd_prompt {
-  echo "\W|${CWD_THEME_PROMPT_COLOR}"
+function __powerline_wd_prompt() {
+	echo "\W|${CWD_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_clock_prompt {
-  echo "$(date +"${THEME_CLOCK_FORMAT}")|${CLOCK_THEME_PROMPT_COLOR}"
+function __powerline_clock_prompt() {
+	echo "$(date +"${THEME_CLOCK_FORMAT}")|${CLOCK_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_battery_prompt {
-  local color=""
-  local battery_status="$(battery_percentage 2> /dev/null)"
+function __powerline_battery_prompt() {
+	local color=""
+	local battery_status="$(battery_percentage 2> /dev/null)"
 
-  if [[ -z "${battery_status}" ]] || [[ "${battery_status}" = "-1" ]] || [[ "${battery_status}" = "no" ]]; then
-    true
-  else
-    if [[ "$((10#${battery_status}))" -le 5 ]]; then
-      color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
-    elif [[ "$((10#${battery_status}))" -le 25 ]]; then
-      color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
-    else
-      color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
-    fi
-    ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
-    echo "${battery_status}%|${color}"
-  fi
+	if [[ -z "${battery_status}" ]] || [[ "${battery_status}" = "-1" ]] || [[ "${battery_status}" = "no" ]]; then
+		true
+	else
+		if [[ "$((10#${battery_status}))" -le 5 ]]; then
+			color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
+		elif [[ "$((10#${battery_status}))" -le 25 ]]; then
+			color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
+		else
+			color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
+		fi
+		ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
+		echo "${battery_status}%|${color}"
+	fi
 }
 
-function __powerline_in_vim_prompt {
-  if [ -n "$VIMRUNTIME" ]; then
-    echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}"
-  fi
+function __powerline_in_vim_prompt() {
+	if [ -n "$VIMRUNTIME" ]; then
+		echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}"
+	fi
 }
 
-function __powerline_aws_profile_prompt {
-  if [[ -n "${AWS_PROFILE}" ]]; then
-    echo "${AWS_PROFILE_CHAR}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR}"
-  fi
+function __powerline_aws_profile_prompt() {
+	if [[ -n "${AWS_PROFILE}" ]]; then
+		echo "${AWS_PROFILE_CHAR}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR}"
+	fi
 }
 
-function __powerline_shlvl_prompt {
-  if [[ "${SHLVL}" -gt 1 ]]; then
-    local prompt="${SHLVL_THEME_PROMPT_CHAR}"
-    local level=$(( ${SHLVL} - 1))
-    echo "${prompt}${level}|${SHLVL_THEME_PROMPT_COLOR}"
-  fi
+function __powerline_shlvl_prompt() {
+	if [[ "${SHLVL}" -gt 1 ]]; then
+		local prompt="${SHLVL_THEME_PROMPT_CHAR}"
+		local level=$((SHLVL - 1))
+		echo "${prompt}${level}|${SHLVL_THEME_PROMPT_COLOR}"
+	fi
 }
 
-function __powerline_dirstack_prompt {
-  if [[ "${#DIRSTACK[@]}" -gt 1 ]]; then
-    local depth=$(( ${#DIRSTACK[@]} - 1 ))
-    local prompt="${DIRSTACK_THEME_PROMPT_CHAR}"
-    if [[ "${depth}" -ge 2 ]]; then
-      prompt+="${depth}"
-    fi
-    echo "${prompt}|${DIRSTACK_THEME_PROMPT_COLOR}"
-  fi
+function __powerline_dirstack_prompt() {
+	if [[ "${#DIRSTACK[@]}" -gt 1 ]]; then
+		local depth=$((${#DIRSTACK[@]} - 1))
+		local prompt="${DIRSTACK_THEME_PROMPT_CHAR}"
+		if [[ "${depth}" -ge 2 ]]; then
+			prompt+="${depth}"
+		fi
+		echo "${prompt}|${DIRSTACK_THEME_PROMPT_COLOR}"
+	fi
 }
 
-function __powerline_history_number_prompt {
-  echo "${HISTORY_NUMBER_THEME_PROMPT_CHAR}\!|${HISTORY_NUMBER_THEME_PROMPT_COLOR}"
+function __powerline_history_number_prompt() {
+	echo "${HISTORY_NUMBER_THEME_PROMPT_CHAR}\!|${HISTORY_NUMBER_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_command_number_prompt {
-  echo "${COMMAND_NUMBER_THEME_PROMPT_CHAR}\#|${COMMAND_NUMBER_THEME_PROMPT_COLOR}"
+function __powerline_command_number_prompt() {
+	echo "${COMMAND_NUMBER_THEME_PROMPT_CHAR}\#|${COMMAND_NUMBER_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_left_segment {
-  local OLD_IFS="${IFS}"; IFS="|"
-  local params=( $1 )
-  IFS="${OLD_IFS}"
-  local pad_before_segment=" "
+function __powerline_left_segment() {
+	local params
+	IFS="|" read -ra params <<< "${1}"
+	local pad_before_segment=" "
 
-  if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
-    if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
-      pad_before_segment=""
-    fi
-  else
-    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
-      pad_before_segment=""
-    fi
-    # Since the previous segment wasn't the last segment, add padding, if needed
-    #
-    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
-      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
-    fi
-    if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
-      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_SEPARATOR_SOFT}${normal}"
-    else
-      LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${POWERLINE_LEFT_SEPARATOR}${normal}"
-    fi
-  fi
+	if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
+			pad_before_segment=""
+		fi
+	else
+		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
+			pad_before_segment=""
+		fi
+		# Since the previous segment wasn't the last segment, add padding, if needed
+		#
+		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
+			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}") ${normal}"
+		fi
+		if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
+			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}")${POWERLINE_LEFT_SEPARATOR_SOFT}${normal}"
+		else
+			LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR}" "${params[1]}")${POWERLINE_LEFT_SEPARATOR}${normal}"
+		fi
+	fi
 
-  LEFT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
-  LAST_SEGMENT_COLOR=${params[1]}
-  (( SEGMENTS_AT_LEFT += 1 ))
+	LEFT_PROMPT+="$(set_color - "${params[1]}")${pad_before_segment}${params[0]}${normal}"
+	LAST_SEGMENT_COLOR=${params[1]}
+	((SEGMENTS_AT_LEFT += 1))
 }
 
-function __powerline_left_last_segment_padding {
-  LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+function __powerline_left_last_segment_padding() {
+	LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}") ${normal}"
 }
 
-function __powerline_last_status_prompt {
-  [[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
+function __powerline_last_status_prompt() {
+	[[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_prompt_command {
-  local last_status="$?" ## always the first
-  local separator_char="${POWERLINE_PROMPT_CHAR}"
+function __powerline_prompt_command() {
+	local last_status="$?" ## always the first
+	local separator_char="${POWERLINE_PROMPT_CHAR}"
 
-  LEFT_PROMPT=""
-  SEGMENTS_AT_LEFT=0
-  LAST_SEGMENT_COLOR=""
+	LEFT_PROMPT=""
+	SEGMENTS_AT_LEFT=0
+	LAST_SEGMENT_COLOR=""
 
+	if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then
+		LEFT_PROMPT+="$(set_color "${PROMPT_DISTRO_LOGO_COLOR}" "${PROMPT_DISTRO_LOGO_COLORBG}")${PROMPT_DISTRO_LOGO}$(set_color - -)"
+	fi
 
-  if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then
-      LEFT_PROMPT+="$(set_color ${PROMPT_DISTRO_LOGO_COLOR} ${PROMPT_DISTRO_LOGO_COLORBG})${PROMPT_DISTRO_LOGO}$(set_color - -)"
-  fi
+	## left prompt ##
+	for segment in $POWERLINE_PROMPT; do
+		local info="$(__powerline_"${segment}"_prompt)"
+		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
+	done
 
-  ## left prompt ##
-  for segment in $POWERLINE_PROMPT; do
-    local info="$(__powerline_${segment}_prompt)"
-    [[ -n "${info}" ]] && __powerline_left_segment "${info}"
-  done
+	[[ "${last_status}" -ne 0 ]] && __powerline_left_segment "$(__powerline_last_status_prompt ${last_status})"
 
-  [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
+	if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+		__powerline_left_last_segment_padding
+	fi
 
-  if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
-    __powerline_left_last_segment_padding
-  fi
+	# By default we try to match the prompt to the adjacent segment's background color,
+	# but when part of the prompt exists within that segment, we instead match the foreground color.
+	local prompt_color="$(set_color "${LAST_SEGMENT_COLOR}" -)"
+	if [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]]; then
+		LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}")${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
+		prompt_color="${normal}"
+	fi
+	[[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="${prompt_color}${separator_char}${normal}"
 
-  # By default we try to match the prompt to the adjacent segment's background color,
-  # but when part of the prompt exists within that segment, we instead match the foreground color.
-  local prompt_color="$(set_color ${LAST_SEGMENT_COLOR} -)"
-  if [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]]; then
-    LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
-    prompt_color="${normal}"
-  fi
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="${prompt_color}${separator_char}${normal}"
+	if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+		LEFT_PROMPT+=" "
+	fi
 
-  if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
-    LEFT_PROMPT+=" "
-  fi
+	PS1="${LEFT_PROMPT}"
 
-  PS1="${LEFT_PROMPT}"
-
-  ## cleanup ##
-  unset LAST_SEGMENT_COLOR \
-        LEFT_PROMPT \
-        SEGMENTS_AT_LEFT
+	## cleanup ##
+	unset LAST_SEGMENT_COLOR \
+		LEFT_PROMPT \
+		SEGMENTS_AT_LEFT
 }
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index d897c7c8..1463d777 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+# shellcheck source=../../themes/powerline/powerline.base.bash
 . "$BASH_IT/themes/powerline/powerline.base.bash"
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}

From ff208775a5e0111e3f90f1d3b55ea9693a08854d Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Thu, 5 Nov 2020 08:28:33 -0800
Subject: [PATCH 355/388] Explain Bash-it variable clearing in lint script

---
 lint_clean_files.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lint_clean_files.sh b/lint_clean_files.sh
index bd34540a..9a5a5cae 100755
--- a/lint_clean_files.sh
+++ b/lint_clean_files.sh
@@ -13,4 +13,11 @@ mapfile -t FILES < <(
 		| xargs -n1 -I{} find "{}" -type f
 )
 
+# We clear the BASH_IT variable to help the schellcheck checker
+# identify source includes within our scripts that require a
+# 'source' directive.  For more information, see:
+#
+#    "Shellcheck SC1090 - Can't follow non-constant source"
+#     https://www.shellcheck.net/wiki/SC1090
+#
 BASH_IT='' pre-commit run --files "${FILES[@]}"

From 75bd5c85c186738ea620bad007dac8e25d877627 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Thu, 5 Nov 2020 08:28:33 -0800
Subject: [PATCH 356/388] Explain Bash-it variable clearing in lint script

---
 lint_clean_files.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lint_clean_files.sh b/lint_clean_files.sh
index bd34540a..26650b16 100755
--- a/lint_clean_files.sh
+++ b/lint_clean_files.sh
@@ -13,4 +13,11 @@ mapfile -t FILES < <(
 		| xargs -n1 -I{} find "{}" -type f
 )
 
+# We clear the BASH_IT variable to help the shellcheck checker
+# identify source includes within our scripts that require a
+# 'source' directive.  For more information, see:
+#
+#    "Shellcheck SC1090 - Can't follow non-constant source"
+#     https://www.shellcheck.net/wiki/SC1090
+#
 BASH_IT='' pre-commit run --files "${FILES[@]}"

From 621ac92ae1be2a9982ec5be446f9069dc4aba023 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 28 Oct 2020 15:25:52 +0200
Subject: [PATCH 357/388] Migrate wiki docs to rtd format

---
 docs/index.rst             |   2 +
 docs/themes-list/index.rst | 558 +++++++++++++++++++++++++++++++++++++
 docs/themes.rst            |  35 +++
 docs/troubleshooting.rst   |  16 ++
 4 files changed, 611 insertions(+)
 create mode 100644 docs/themes-list/index.rst
 create mode 100644 docs/troubleshooting.rst

diff --git a/docs/index.rst b/docs/index.rst
index 7f4649e7..e5bc2667 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,8 +21,10 @@ Stop polluting your ``~/bin`` directory and your ``.bashrc`` file, fork/clone Ba
    commands/index
    custom
    themes
+   themes-list/index
    vcs_user
    misc
+   troubleshooting
    uninstalling
 
 
diff --git a/docs/themes-list/index.rst b/docs/themes-list/index.rst
new file mode 100644
index 00000000..0df4c087
--- /dev/null
+++ b/docs/themes-list/index.rst
@@ -0,0 +1,558 @@
+.. _list_of_themes:
+
+List of Themes
+==============
+
+Below is a list of all of the themes (with screenshots) that `bash-it <https://github.com/Bash-it/bash-it/>`_ ships with.
+
+Alphabetical List:
+------------------
+
+Bakke
+^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-black.jpg
+   :alt: Bakke
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-white.jpg
+   :alt: Bakke
+
+
+----
+
+BarbUk
+^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-black.png
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-black.png
+   :alt: BarbUk
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-white.png
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-white.png
+   :alt: BarbUk
+
+
+----
+
+Bobby
+^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-white.jpg
+   :alt:
+
+
+----
+
+Brunton
+^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/brunton-black.png
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/brunton-black.png
+   :alt:
+
+
+----
+
+Candy
+^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-white.jpg
+   :alt:
+
+
+----
+
+Clean
+^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-white.jpg
+   :alt:
+
+
+----
+
+Demula
+^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-white.jpg
+   :alt:
+
+
+----
+
+DOS
+^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-white.jpg
+   :alt:
+
+
+----
+
+DoubleTime
+^^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-white.jpg
+   :alt:
+
+
+----
+
+DoubleTime Multiline
+^^^^^^^^^^^^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-white.jpg
+   :alt:
+
+
+----
+
+Doubletime Multiline Python Only
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-white.jpg
+   :alt:
+
+
+----
+
+Envy
+^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-white.jpg
+   :alt:
+
+
+----
+
+Iterate
+^^^^^^^
+
+Responsively wraps prompt based on terminal width.
+
+
+.. image:: https://cloud.githubusercontent.com/assets/1319655/2923152/3a763194-d70e-11e3-9e52-3740de9bbb9b.png
+   :target: https://cloud.githubusercontent.com/assets/1319655/2923152/3a763194-d70e-11e3-9e52-3740de9bbb9b.png
+   :alt:
+
+
+.. image:: https://cloud.githubusercontent.com/assets/1319655/2923143/14b8e0d2-d70e-11e3-9706-f5341fff8e5c.png
+   :target: https://cloud.githubusercontent.com/assets/1319655/2923143/14b8e0d2-d70e-11e3-9706-f5341fff8e5c.png
+   :alt:
+
+
+----
+
+Mr Briggs
+^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-white.jpg
+   :alt:
+
+
+----
+
+Minimal
+^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-white.jpg
+   :alt:
+
+
+----
+
+Modern
+^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-white.jpg
+   :alt:
+
+
+----
+
+Modern T
+^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-white.jpg
+   :alt:
+
+
+----
+
+Metal
+^^^^^
+
+
+.. image:: https://raw.githubusercontent.com/jrab66/bash-it/7cc82b518d6286fc68c8477d809ce9f417501976/themes/metal/metalthemeblack.png
+   :target: https://raw.githubusercontent.com/jrab66/bash-it/7cc82b518d6286fc68c8477d809ce9f417501976/themes/metal/metalthemeblack.png
+   :alt:
+
+
+----
+
+n0Qorg
+^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-white.jpg
+   :alt:
+
+
+----
+
+NWinkler
+^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-white.jpg
+   :alt:
+
+
+----
+
+Pete
+^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-white.jpg
+   :alt:
+
+
+----
+
+Powerline
+^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-white.jpg
+   :alt:
+
+
+----
+
+Powerline Naked
+^^^^^^^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-white.jpg
+   :alt:
+
+
+----
+
+Powerline Plain
+^^^^^^^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-white.jpg
+   :alt:
+
+
+----
+
+Pure
+^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-white.jpg
+   :alt:
+
+
+----
+
+RainbowBrite
+^^^^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-white.jpg
+   :alt:
+
+
+----
+
+R Jorgenson
+^^^^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-white.jpg
+   :alt:
+
+
+----
+
+Sexy
+^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-white.jpg
+   :alt:
+
+
+----
+
+Simple
+^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-white.jpg
+   :alt:
+
+
+----
+
+SirUp
+^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-white.jpg
+   :alt:
+
+
+----
+
+Standard
+^^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-white.jpg
+   :alt:
+
+
+----
+
+Tonka
+^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-white.jpg
+   :alt:
+
+
+----
+
+Tylenol
+^^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-white.jpg
+   :alt:
+
+
+----
+
+Zitron
+^^^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-white.jpg
+   :alt:
+
+
+----
+
+Zork
+^^^^
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-black.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-black.jpg
+   :alt:
+
+
+.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-white.jpg
+   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-white.jpg
+   :alt:
diff --git a/docs/themes.rst b/docs/themes.rst
index 27b93a29..aa21a7e3 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -29,6 +29,41 @@ You can see theme screenshots on `wiki/Themes <https://github.com/Bash-it/bash-i
 
 **NOTE**\ : Bash-it and some themes use UTF-8 characters, so to avoid strange behavior in your terminal, set your locale to ``LC_ALL=en_US.UTF-8`` or the equivalent to your language if it isn't American English.
 
+List of Themes
+^^^^^^^^^^^^^^
+
+See :ref:`here <list_of_themes>`.
+
+Theme Switches & Variables
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Clock Related
+=============
+
+function: ``clock_char``
+########################
+
+Prints a character indicating clock.
+
+
+* ``THEME_SHOW_CLOCK_CHAR`` : **true**\ /false
+
+* ``THEME_CLOCK_CHAR`` : "\ **⌚**\ "
+
+* ``THEME_CLOCK_CHAR_COLOR`` : "\ **$normal**\ "
+
+function: ``clock_prompt``
+##########################
+
+Prints the clock prompt (date, time).
+
+
+* ``THEME_SHOW_CLOCK`` : **true**\ /false
+
+* ``THEME_CLOCK_COLOR`` :  "\ **$normal**\ "
+
+* ``THEME_CLOCK_FORMAT`` : "\ **%H:%M:%S**\ "
+
 Contributing a new theme
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
new file mode 100644
index 00000000..6503699a
--- /dev/null
+++ b/docs/troubleshooting.rst
@@ -0,0 +1,16 @@
+.. _troubleshooting:
+
+Troubleshooting Guide
+=====================
+
+Table of Contents
+-----------------
+
+* `I'm stuck in the LightDM login screen after setting up bash-it. <im-stuck-in-the-lightdm-login-screen-after-setting-up-bash-it>`_
+
+I'm stuck in the LightDM login screen after setting up bash-it
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Possible issue**\ : `#672 <https://github.com/Bash-it/bash-it/issues/672>`_
+
+**Solution**\ : Check `this comment <https://github.com/Bash-it/bash-it/issues/672#issuecomment-257870653>`_ for detailed information about the cause and solution for this issue.

From 5cdb98f802b76efa88088fce5573907c88719f61 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 5 Nov 2020 20:45:20 +0200
Subject: [PATCH 358/388] pre-commit: Exclude docs _build folder

---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0bd696da..84ed6ee7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,6 +3,7 @@
 ---
 # fail_fast: true
 minimum_pre_commit_version: 1.18.1
+exclude: "docs/_build/"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0

From 864970bcd21e31eb1d6d5236a33a9d2832a7a3f7 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 26 Oct 2020 16:37:43 +0200
Subject: [PATCH 359/388] docs: Transition md files to support new rtd format

---
 CONTRIBUTING.md |  91 ---------
 DEVELOPMENT.md  |  74 --------
 README.md       | 494 ++----------------------------------------------
 test/README.md  |  40 ----
 4 files changed, 19 insertions(+), 680 deletions(-)
 delete mode 100644 CONTRIBUTING.md
 delete mode 100644 DEVELOPMENT.md
 delete mode 100644 test/README.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 8c251c6c..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Contribution Guidelines
-
-When contributing a new feature, a bug fix, a new theme, or any other change to Bash-it, please consider the following guidelines.
-Most of this is common sense, but please try to stick to the conventions listed here.
-
-## Issues
-
-* When opening a new issue in the issue tracker, please include information about which _Operating System_ you're using, and which version of _Bash_.
-* In many cases, it also makes sense to show which Bash-it plugins you are using.
-  This information can be obtained using `bash-it show plugins`.
-* If the issue happens while loading Bash-it, please also include your `~/.bash_profile` or `~/.bashrc` file,
-  as well as the install location of Bash-it (default should be `~/.bash_it`).
-* When reporting a bug or requesting a new feature, consider providing a Pull Request that fixes the issue or can be used as a starting point for the new feature.
-  Don't be afraid, most things aren't that complex...
-
-## Pull Requests
-
-* Fork the Bash-it repo, create a new feature branch from _master_ and apply your changes there.
-  Create a _Pull Request_ from your feature branch against Bash-it's _master_ branch.
-* Limit each Pull Request to one feature.
-  Don't bundle multiple features/changes (e.g. a new _Theme_ and a fix to an existing plugin) into a single Pull Request - create one PR for the theme, and a separate PR for the fix.
-* For complex changes, try to _squash_ your changes into a single commit before
-  pushing code. Once you've pushed your code and opened a PR, please refrain
-  from force-pushing changes to the PR branch – remember, Bash-it is a
-  distributed project and your branch may be in use already.
-* When in doubt, open a PR with too many commits. Bash-it is a learning project
-  for everyone involved. Showing your work provides a great history for folks
-  to learn what works and what didn't.
-
-## Code Style
-
-* Try to stick to the existing code style. Please don't reformat or change the syntax of existing code simply because you don't like that style.
-* Indentation is using spaces, not tabs. Most of the code is indented with 2 spaces, some with 4 spaces. Please try to stick to 2 spaces.
-  If you're using an editor that supports [EditorConfig](http://EditorConfig.org), the editor should automatically use the settings defined in Bash-it's [.editorconfig file](.editorconfig).
-* When creating new functions, please use a dash ("-") to separate the words of the function's name, e.g. `my-new-function`.
-  Don't use underscores, e.g. `my_new_function`.
-* Internal functions that aren't to be used by the end user should start with an underscore, e.g. `_my-new-internal-function`.
-* Use the provided meta functions to document your code, e.g. `about-plugin`, `about`, `group`, `param`, `example`.
-  This will make it easier for other people to use your new functionality.
-  Take a look at the existing code for an example (e.g. [the base plugin](plugins/available/base.plugin.bash)).
-* When adding files, please use the existing file naming conventions, e.g. plugin files need to end in `.plugin.bash`.
-  This is important for the installation functionality.
-* When using the `$BASH_IT` variable, please always enclose it in double quotes to ensure that the code also works when Bash-it is installed in a directory that contains spaces in its name: `for f in "${BASH_IT}/plugins/available"/*.bash ; do echo "$f" ; done`
-* Bash-it supports Bash 3.2 and higher. Please don't use features only available in Bash 4, such as associative arrays.
-
-## Unit Tests
-
-When adding features or making changes/fixes, please run our growing unit test suite to ensure that you did not break existing functionality.
-The test suite does not cover all aspects of Bash-it, but please run it anyway to verify that you did not introduce any regression issues.
-
-Any code pushed to GitHub as part of a Pull Request will automatically trigger a continuous integration build on [Travis CI](https://travis-ci.org/Bash-it/bash-it), where the test suite is run on both Linux and macOS.
-The Pull Request will then show the result of the Travis build, indicating whether all tests ran fine, or whether there were issues.
-Please pay attention to this, Pull Requests with build issues will not be merged.
-
-Adding new functionality or changing existing functionality is a good opportunity to increase Bash-it's test coverage.
-When you're changing the Bash-it codebase, please consider adding some unit tests that cover the new or changed functionality.
-Ideally, when fixing a bug, a matching unit test that verifies that the bug is no longer present, is added at the same time.
-
-To run the test suite, simply execute the following in the directory where you cloned Bash-it:
-
-```bash
-test/run
-```
-
-This command will ensure that the [Bats Test Framework](https://github.com/bats-core/bats-core) is available in the local `test_lib` directory (Bats is included as a Git submodule) and then run the test suite found in the [test](test) folder.
-The test script will execute each test in turn, and will print a status for each test case.
-
-When adding new test cases, please take a look at the existing test cases for examples.
-
-The following libraries are used to help with the tests:
-
-* Test Framework: https://github.com/bats-core/bats-core
-* Support library for Bats-Assert: https://github.com/ztombol/bats-support
-* General `assert` functions: https://github.com/ztombol/bats-assert
-* File `assert` functions: https://github.com/ztombol/bats-file
-
-When verifying test results, please try to use the `assert` functions found in these libraries.
-
-## Features
-
-* When adding new completions or plugins, please don't simply copy existing tools into the Bash-it codebase, try to load/integrate the tools instead.
-  An example is using `nvm`: Instead of copying the existing `nvm` script into Bash-it, the `nvm.plugin.bash` file tries to load an existing installation of `nvm`.
-  This means an additional step for the user (installing `nvm` from its own repo, or through a package manager),
-  but it will also ensure that `nvm` can be upgraded in an easy way.
-
-## Themes
-
-* When adding a new theme, please include a screenshot and a short description about what makes this theme unique in the Pull Request's description field.
-  Please do not add theme screenshots to the repo itself, as they will add unnecessary bloat to the repo.
-  The project's Wiki has a _Themes_ page where you can add a screenshot if you want.
-* Ideally, each theme's folder should contain a `README.md` file describing the theme and its configuration options.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
deleted file mode 100644
index 2f7941cb..00000000
--- a/DEVELOPMENT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Bash-it Development
-
-This page summarizes a couple of rules to keep in mind when developing features or making changes in Bash-it.
-
-## Debugging and Logging
-
-### General Logging
-
-While developing feature or making changes in general, you can log error/warning/debug
-using `_log_error` `_log_warning` and `_log_debug`. This will help you solve problems quicker
-and also propagate important notes to other users of Bash-it.
-You can see the logs by using `bash-it doctor` command to reload and see the logs.
-Alternatively, you can set `BASH_IT_LOG_LEVEL` to `BASH_IT_LOG_LEVEL_ERROR`, `BASH_IT_LOG_LEVEL_WARNING` or `BASH_IT_LOG_LEVEL_ALL`.
-
-### Log Prefix/Context
-
-You can define `BASH_IT_LOG_PREFIX` in your files in order to a have a constant prefix before your logs.
-Note that we prefer to uses "tags" based logging, i.e `plugins: git: DEBUG: Loading git plugin`.
-
-
-## Load Order
-
-### General Load Order
-
-The main `bash_it.sh` script loads the frameworks individual components in the following order:
-
-* `lib/composure.bash`
-* Files in `lib` with the exception of `appearance.bash` - this means that `composure.bash` is loaded again here (possible improvement?)
-* Enabled `aliases`
-* Enabled `plugins`
-* Enabled `completions`
-* `themes/colors.theme.bash`
-* `themes/base.theme.bash`
-* `lib/appearance.bash`, which loads the selected theme
-* Custom `aliases`
-* Custom `plugins`
-* Custom `completions`
-* Additional custom files from either `$BASH_IT/custom` or `$BASH_IT_CUSTOM`
-
-This order is subject to change.
-
-### Individual Component Load Order
-
-For `aliases`, `plugins` and `completions`, the following rules are applied that influence the load order:
-
-* There is a global `enabled` directory, which the enabled components are linked into. Enabled plugins are symlinked from `$BASH_IT/plugins/available` to `$BASH_IT/enabled` for example. All component types are linked into the same common `$BASH_IT/enabled` directory.
-* Within the common `enabled` directories, the files are loaded in alphabetical order, which is based on the item's load priority (see next item).
-* When enabling a component, a _load priority_ is assigned to the file. The following default priorities are used:
-    * Aliases: 150
-    * Plugins: 250
-    * Completions: 350
-* When symlinking a component into the `enabled` directory, the load priority is used as a prefix for the linked name, separated with three dashes from the name of the component. The `node.plugin.bash` would be symlinked to `250---node.plugin.bash` for example.
-* Each file can override the default load priority by specifying a new value. To do this, the file needs to include a comment in the following form. This example would cause the `node.plugin.bash` (if included in that file) to be linked to `225---node.plugin.bash`:
-
-  ```bash
-  # BASH_IT_LOAD_PRIORITY: 225
-  ```
-
-Having the order based on a numeric priority in a common directory allows for more flexibility. While in general, aliases are loaded first (since their default priority is 150), it's possible to load some aliases after the plugins, or some plugins after completions by setting the items' load priority. This is more flexible than a fixed type-based order or a strict alphabetical order based on name.
-
-These items are subject to change. When making changes to the internal functionality, this page needs to be updated as well.
-
-## Plugin Disable Callbacks
-
-Plugins can define a function that will be called when the plugin is being disabled.
-The callback name should be `{PLUGIN_NAME}_on_disable`, you can see `gitstatus` for usage example.
-
-## Using the pre-commit hook
-
-Note the file .pre-commit-config.yaml at the top of the repo.
-This file configures the behavior of the a pre-commit hook based on [the Pre-Commit framework](https://pre-commit.com/). Please see the site about
-installing it (with pip, brew or other tools) then run `pre-commit install` in the repo's root to activate the hook.
-For the full use of the tool, you may need to install also other third-party tools, such as
-[shellcheck](https://github.com/koalaman/shellcheck/) and [shfmt](https://github.com/mvdan/sh).
diff --git a/README.md b/README.md
index 1da1f7eb..8867f05a 100644
--- a/README.md
+++ b/README.md
@@ -13,490 +13,34 @@ If you're using the _Bourne Again Shell_ (Bash) regularly and have been looking
 Stop polluting your `~/bin` directory and your `.bashrc` file, fork/clone Bash-it and start hacking away.
 
 - [Contributing](#contributing)
-- [Installation](#installation)
-  - [Install Options](#install-options)
-  - [via Docker](#install-using-docker)
-  - [Updating](#updating)
-- [Help](#help-screens)
-- [Search](#search)
-  - [Syntax](#syntax)
-  - [Searching with Negations](#searching-with-negations)
-  - [Using Search to Enable or Disable Components](#using-search-to-enable-or-disable-components)
-  - [Disabling ASCII Color](#disabling-ascii-color)
-- [Custom scripts, aliases, themes, and functions](#custom-scripts-aliases-themes-and-functions)
-- [Themes](#themes)
-- [Uninstalling](#uninstalling)
-- [Misc](#misc)
-- [Help Out](#help-out)
+- [Installation](https://bash-it.readthedocs.io/en/latest/installation)
+  - [Install Options](https://bash-it.readthedocs.io/en/latest/installation/#install-options)
+  - [via Docker](https://bash-it.readthedocs.io/en/latest/installation/#install-using-docker)
+  - [Updating](https://bash-it.readthedocs.io/en/latest/installation/#updating)
+- [Help](https://bash-it.readthedocs.io/en/latest/misc/#help-screens)
+- [Search](https://bash-it.readthedocs.io/en/latest/commands/search)
+  - [Syntax](https://bash-it.readthedocs.io/en/latest/commands/search/#syntax)
+  - [Searching with Negations](
+  https://bash-it.readthedocs.io/en/latest/commands/search/#searching-with-negations)
+  - [Using Search to Enable or Disable Components](https://bash-it.readthedocs.io/en/latest/commands/search/#using-search-to-enable-or-disable-components)
+  - [Disabling ASCII Color](https://bash-it.readthedocs.io/en/latest/commands/search/#disabling-ascii-color)
+- [Custom scripts, aliases, themes, and functions](
+  https://bash-it.readthedocs.io/en/latest/custom)
+- [Themes](https://bash-it.readthedocs.io/en/latest/themes)
+- [Uninstalling](https://bash-it.readthedocs.io/en/latest/uninstalling)
+- [Misc](https://bash-it.readthedocs.io/en/latest/misc)
+- [Help Out](https://bash-it.readthedocs.io/en/latest/#help-out)
 - [Contributors](#contributors)
 
 ## Contributing
 
-Please take a look at the [Contribution Guidelines](CONTRIBUTING.md) before reporting a bug or providing a new feature.
+Please take a look at the [Contribution Guidelines](https://bash-it.readthedocs.io/en/latest/contributing) before reporting a bug or providing a new feature.
 
-The [Development Guidelines](DEVELOPMENT.md) have more information on some of the internal workings of Bash-it,
+The [Development Guidelines](https://bash-it.readthedocs.io/en/latest/development) have more information on some of the internal workings of Bash-it,
 please feel free to read through this page if you're interested in how Bash-it loads its components.
 
-## Installation
-
-1. Check out a clone of this repo to a location of your choice, such as
-   `git clone --depth=1 https://github.com/Bash-it/bash-it.git ~/.bash_it`
-2. Run `~/.bash_it/install.sh` (it automatically backs up your `~/.bash_profile` or `~/.bashrc`, depending on your OS)
-3. Edit your modified config (`~/.bash_profile` or `~/.bashrc`) file in order to customize Bash-it.
-4. Check out available aliases, completions, and plugins and enable the ones you want to use (see the next section for more details).
-
-### Install Options
-
-The install script can take the following options:
-
-* `--interactive`: Asks the user which aliases, completions and plugins to enable.
-* `--silent`: Ask nothing and install using default settings.
-* `--no-modify-config`: Do not modify the existing config file (`~/.bash_profile` or `~/.bashrc`).
-
-When run without the `--interactive` switch, Bash-it only enables a sane default set of functionality to keep your shell clean and to avoid issues with missing dependencies.
-Feel free to enable the tools you want to use after the installation.
-
-When you run without the `--no-modify-config` switch, the Bash-it installer automatically modifies/replaces your existing config file.
-Use the `--no-modify-config` switch to avoid unwanted modifications, e.g. if your Bash config file already contains the code that loads Bash-it.
-
-**NOTE**: Keep in mind how Bash loads its configuration files,
-`.bash_profile` for login shells (and in macOS in terminal emulators like [Terminal.app](http://www.apple.com/osx/apps/) or
-[iTerm2](https://www.iterm2.com/)) and `.bashrc` for interactive shells (default mode in most of the GNU/Linux terminal emulators),
-to ensure that Bash-it is loaded correctly.
-A good "practice" is sourcing `.bashrc` into `.bash_profile` to keep things working in all the scenarios.
-To achieve this, you can add this snippet in your `.bash_profile`:
-
-```
-if [ -f ~/.bashrc ]; then
-  . ~/.bashrc
-fi
-```
-
-Refer to the official [Bash documentation](https://www.gnu.org/software/bash/manual/bashref.html#Bash-Startup-Files) to get more info.
-
-
-### Install using Docker
-
-You can try Bash-it in an isolated environment without changing any local files via a [Docker](https://www.docker.com/) Container.
-(Bash Shell v4.4 with Bash-it, [bats](https://github.com/sstephenson/bats),and bash-completion based on [Alpine Linux](https://alpinelinux.org/)).
-
-`docker pull ellerbrock/bash-it`
-
-Have a look at our [bash-it-docker repository](https://github.com/Bash-it/bash-it-docker) for further information.
-
-
-### Updating
-
-To update Bash-it to the latest stable version, simply run:
-
-```bash
-bash-it update stable
-```
-
-If you want to update to the latest dev version (directly from master), run:
-
-```bash
-bash-it update dev
-```
-
-If you want to update automatically and unattended, you can add the optional
-`-s/--silent` flag, for example:
-
-```bash
-bash-it update dev --silent
-```
-
-If you are using an older version of Bash-it, it's possible that some functionality has changed, or that the internal structure of how Bash-it organizes its functionality has been updated.
-For these cases, we provide a `migrate` command:
-
-```bash
-bash-it migrate
-```
-
-This command will automatically migrate the Bash-it structure to the latest version.
-The `migrate` command is run automatically if you run the `update`, `enable` or `disable` commands.
-
-## Help Screens
-
-```bash
-bash-it show aliases        # shows installed and available aliases
-bash-it show completions    # shows installed and available completions
-bash-it show plugins        # shows installed and available plugins
-bash-it help aliases        # shows help for installed aliases
-bash-it help completions    # shows help for installed completions
-bash-it help plugins        # shows help for installed plugins
-```
-
-## Search
-
-If you need to quickly find out which of the plugins, aliases or completions are available for a specific framework, programming language, or an environment, you can _search_ for multiple terms related to the commands you use frequently.
-Search will find and print out modules with the name or description matching the terms provided.
-
-### Syntax
-
-```bash
-  bash-it search term1 [[-]term2] [[-]term3]....
-```
-
-As an example, a ruby developer might want to enable everything related to the commands such as `ruby`, `rake`, `gem`, `bundler`, and `rails`.
-Search command helps you find related modules so that you can decide which of them you'd like to use:
-
-```bash
-❯ bash-it search ruby rake gem bundle irb rails
-      aliases:  bundler rails
-      plugins:  chruby chruby-auto ruby
-  completions:  bundler gem rake
-```
-
-Currently enabled modules will be shown in green.
-
-### Searching with Negations
-
-You can prefix a search term with a "-" to exclude it from the results.
-In the above example, if we wanted to hide `chruby` and `chruby-auto`,
-we could change the command as follows:
-
-```bash
-❯ bash-it search ruby rake gem bundle irb rails -chruby
-      aliases:  bundler rails
-      plugins:  ruby
-  completions:  bundler gem rake
-```
-
-### Using Search to Enable or Disable Components
-
-By adding a `--enable` or `--disable` to the search command, you can automatically enable all modules that come up as a result of a search query.
-This could be quite handy if you like to enable a bunch of components related to the same topic.
-
-### Disabling ASCII Color
-
-To remove non-printing non-ASCII characters responsible for the coloring of the search output, you can set environment variable `NO_COLOR`.
-Enabled components will then be shown with a checkmark:
-
-```bash
-❯ NO_COLOR=1 bash-it search ruby rake gem bundle irb rails -chruby
-      aliases  =>   ✓bundler ✓rails
-      plugins  =>   ✓ruby
-  completions  =>   bundler gem rake
-```
-
-## Custom scripts, aliases, themes, and functions
-
-For custom scripts, and aliases, just create the following files (they'll be ignored by the git repo):
-
-* `aliases/custom.aliases.bash`
-* `completion/custom.completion.bash`
-* `lib/custom.bash`
-* `plugins/custom.plugins.bash`
-* `custom/themes/<custom theme name>/<custom theme name>.theme.bash`
-
-Anything in the custom directory will be ignored, with the exception of `custom/example.bash`.
-
-Alternately, if you would like to keep your custom scripts under version control, you can set `BASH_IT_CUSTOM` in your `~/.bashrc` to another location outside of the `$BASH_IT` folder.
-In this case, any `*.bash` file under every directory below `BASH_IT_CUSTOM` folder will be used.
-
-## Themes
-
-There are over 50+ Bash-it themes to pick from in `$BASH_IT/themes`.
-The default theme is `bobby`.
-Set `BASH_IT_THEME` to the theme name you want, or if you've developed your own custom theme outside of `$BASH_IT/themes`,
-point the `BASH_IT_THEME` variable directly to the theme file.
-To disable theming completely, leave the variable empty.
-
-Examples:
-
-```bash
-# Use the "powerline-multiline" theme
-export BASH_IT_THEME="powerline-multiline"
-
-# Use a theme outside of the Bash-it folder
-export BASH_IT_THEME="/home/foo/my_theme/my_theme.theme.bash"
-
-# Disable theming
-export BASH_IT_THEME=""
-```
-
-You can easily preview the themes in your own shell using `BASH_PREVIEW=true bash-it reload`.
-
-If you've created your own custom prompts, we'd love it if you shared them with everyone else! Just submit a Pull Request.
-You can see theme screenshots on [wiki/Themes](https://github.com/Bash-it/bash-it/wiki/Themes).
-
-**NOTE**: Bash-it and some themes use UTF-8 characters, so to avoid strange behavior in your terminal, set your locale to `LC_ALL=en_US.UTF-8` or the equivalent to your language if it isn't American English.
-
-## Uninstalling
-
-To uninstall Bash-it, run the `uninstall.sh` script found in the `$BASH_IT` directory:
-
-```
-cd $BASH_IT
-./uninstall.sh
-```
-
-This will restore your previous Bash profile.
-After the uninstall script finishes, remove the Bash-it directory from your machine (`rm -rf $BASH_IT`) and start a new shell.
-
-## Misc
-
-### Bash Profile Aliases
-
-Bash-it creates a `reload` alias that makes it convenient to reload
-your Bash profile when you make changes.
-
-Additionally, if you export `BASH_IT_AUTOMATIC_RELOAD_AFTER_CONFIG_CHANGE` as a non-null value,
-Bash-it will automatically reload itself after activating or deactivating plugins, aliases, or completions.
-
-### Prompt Version Control Check
-
-Bash-it provides prompt themes with the ability to check and display version control information for the current directory.
-The information is retrieved for each directory and can slow down the navigation of projects with a large number of files and folders.
-Turn version control checking off to prevent slow directory navigation within large projects.
-
-Bash-it provides a flag (`SCM_CHECK`) within the `~/.bash_profile` file that turns off/on version control information checking and display within all themes.
-Version control checking is on by default unless explicitly turned off.
-
-Set `SCM_CHECK` to 'false' to **turn off** version control checks for all themes:
-
-* `export SCM_CHECK=false`
-
-Set `SCM_CHECK` to 'true' (the default value) to **turn on** version control checks for all themes:
-
-* `export SCM_CHECK=true`
-
-**NOTE:**
-It is possible for themes to ignore the `SCM_CHECK` flag and query specific version control information directly.
-For example, themes that use functions like `git_prompt_vars` skip the `SCM_CHECK` flag to retrieve and display git prompt information.
-If you turned version control checking off and you still see version control information within your prompt, then functions like `git_prompt_vars` are most likely the reason why.
-
-### Git prompt
-
-Bash-it has some nice features related to Git, continue reading to know more about these features.
-
-### Repository info in the prompt
-
-Bash-it can show some information about Git repositories in the shell prompt: the current branch, tag or commit you are at, how many commits the local branch is ahead or behind from the remote branch, and if you have changes stashed.
-
-Additionally, you can view the status of your working copy and get the count of *staged*, *unstaged* and *untracked* files.
-This feature is controlled through the flag `SCM_GIT_SHOW_DETAILS` as follows:
-
-Set `SCM_GIT_SHOW_DETAILS` to 'true' (the default value) to **show** the working copy details in your prompt:
-
-* `export SCM_GIT_SHOW_DETAILS=true`
-
-Set `SCM_GIT_SHOW_DETAILS` to 'false' to **don't show** it:
-
-* `export SCM_GIT_SHOW_DETAILS=false`
-
-**NOTE:** If using `SCM_GIT_SHOW_MINIMAL_INFO=true`, then the value of `SCM_GIT_SHOW_DETAILS` is ignored.
-
-### Remotes and remote branches
-
-In some git workflows, you must work with various remotes, for this reason, Bash-it can provide some useful information about your remotes and your remote branches, for example, the remote on you are working, or if your local branch is tracking a remote branch.
-
-You can control this feature with the flag `SCM_GIT_SHOW_REMOTE_INFO` as follows:
-
-Set `SCM_GIT_SHOW_REMOTE_INFO` to 'auto' (the default value) to activate it only when more than one remote is configured in the current repo:
-
-* `export SCM_GIT_SHOW_REMOTE_INFO=auto`
-
-Set `SCM_GIT_SHOW_REMOTE_INFO` to 'true' to always activate the feature:
-
-* `export SCM_GIT_SHOW_REMOTE_INFO=true`
-
-Set `SCM_GIT_SHOW_REMOTE_INFO` to 'false' to **disable the feature**:
-
-* `export SCM_GIT_SHOW_REMOTE_INFO=false`
-
-**NOTE:** If using `SCM_GIT_SHOW_MINIMAL_INFO=true`, then the value of `SCM_GIT_SHOW_REMOTE_INFO` is ignored.
-
-### Untracked files
-
-By default, the `git status` command shows information about *untracked* files.
-This behavior can be controlled through command-line flags or git configuration files.
-For big repositories, ignoring *untracked* files can make git faster.
-Bash-it uses `git status` to gather the repo information it shows in the prompt, so in some circumstances, it can be useful to instruct Bash-it to ignore these files.
-You can control this behavior with the flag `SCM_GIT_IGNORE_UNTRACKED`:
-
-Set `SCM_GIT_IGNORE_UNTRACKED` to 'false' (the default value) to get information about *untracked* files:
-
-* `export SCM_GIT_IGNORE_UNTRACKED=false`
-
-Set `SCM_GIT_IGNORE_UNTRACKED` to 'true' to **ignore** *untracked* files:
-
-* `export SCM_GIT_IGNORE_UNTRACKED=true`
-
-Also, with this flag to false, Bash-it will not show the repository as dirty when the repo has *untracked* files, and will not display the count of *untracked* files.
-
-**NOTE:** If you set in git configuration file the option to ignore *untracked* files, this flag has no effect, and Bash-it will ignore *untracked* files always.
-
-### Stash item count
-
-When `SCM_GIT_SHOW_DETAILS` is enabled, you can get the count of *stashed* items. This feature can be useful when a user has a lot of stash items.
-This feature is controlled through the flag `SCM_GIT_SHOW_STASH_INFO` as follows:
-
-Set `SCM_GIT_SHOW_STASH_INFO` to 'true' (the default value) to **show** the count of stashed items:
-
-* `export SCM_GIT_SHOW_STASH_INFO=true`
-
-Set `SCM_GIT_SHOW_STASH_INFO` to 'false' to **don't show** it:
-
-* `export SCM_GIT_SHOW_STASH_INFO=false`
-
-### Ahead/Behind Count
-
-When displaying information regarding whether or not the local branch is ahead or behind its remote counterpart, you can opt to display the number of commits ahead/behind.
-This is useful if you only care whether or not you are ahead or behind and do not care how far ahead/behind you are.
-
-Set `SCM_GIT_SHOW_COMMIT_COUNT` to 'true' (the default value) to **show** the count of commits ahead/behind:
-
-* `export SCM_GIT_SHOW_COMMIT_COUNT=true`
-
-Set `SCM_GIT_SHOW_COMMIT_COUNT` to 'false' to **don't show** it:
-
-* `export SCM_GIT_SHOW_COMMIT_COUNT=false`
-
-### Git user
-
-In some environments, it is useful to know the value of the current git user, which is used to mark all new commits.
-For example, any organization that uses the practice of pair programming will typically author each commit with [combined names of the two authors](https://github.com/pivotal/git_scripts).
-When another pair uses the same pairing station, the authors are changed at the beginning of the session.
-
-To get up and running with this technique, run `gem install pivotal_git_scripts`, and then edit your `~/.pairs` file, according to the specification on the [gem's homepage](https://github.com/pivotal/git_scripts).
-After that, you should be able to run `git pair kg as` to set the author to, eg. "Konstantin Gredeskoul and Alex Saxby", assuming they've been added to the `~/.pairs` file.
-Please see gem's documentation for more information.
-
-To enable the display of the current pair in the prompt, you must set `SCM_GIT_SHOW_CURRENT_USER` to `true`.
-Once set, the `SCM_CURRENT_USER` variable will be automatically populated with the initials of the git author(s).
-It will also be included in the default git prompt.
-Even if you do not have `git pair` installed, as long as your `user.name` is set, your initials will be computed from your name and shown in the prompt.
-
-You can control the prefix and the suffix of this component using the two variables:
-
-* `export SCM_THEME_CURRENT_USER_PREFFIX=' ☺︎ '`
-
-And
-
-* `export SCM_THEME_CURRENT_USER_SUFFIX=' ☺︎ '`
-
-**NOTE:** If using `SCM_GIT_SHOW_MINIMAL_INFO=true`, then the value of `SCM_GIT_SHOW_CURRENT_USER` is ignored.
-
-### Git show minimal status info
-
-To speed up the prompt while still getting minimal git status information displayed such as the value of `HEAD` and whether there are any dirty objects, you can set:
-
-```
-export SCM_GIT_SHOW_MINIMAL_INFO=true
-```
-
-### Ignore repo status
-
-When working in repos with a large codebase, Bash-it can slow down your prompt when checking the repo status.
-To avoid it, there is an option you can set via Git config to disable checking repo status in Bash-it.
-
-To disable checking the status in the current repo:
-
-```
-$ git config --add bash-it.hide-status 1
-```
-
-But if you would like to disable it globally, and stop checking the status for all of your repos:
-
-```
-$ git config --global --add bash-it.hide-status 1
-```
-
-Setting this flag globally has the same effect as `SCM_CHECK=true`, but only for Git repos.
-
-### Speed up git status calculations
-
-As an alternative to ignoring repo status entirely, you can try out the `gitstatus` plugin.
-This plugin speeds up all `git status` calculations by up to 10x times!
-
-**NOTE**: You will need to clone `gitstatus` repo from [here](https://github.com/romkatv/gitstatus).
-
-### Pass function renamed to passgen
-
-The Bash-it `pass` function has been renamed to `passgen` in order to avoid a naming conflict with the [pass password manager](https://www.passwordstore.org/).
-In order to minimize the impact on users of the legacy Bash-it `pass` function, Bash-it will create the alias `pass` that calls the new `passgen` function if the `pass` password manager command is not found on the `PATH` (default behavior).
-
-This behavior can be overridden with the `BASH_IT_LEGACY_PASS` flag as follows:
-
-Set `BASH_IT_LEGACY_PASS` to 'true' to force Bash-it to always **create** the `pass` alias to `passgen`:
-
-* `export BASH_IT_LEGACY_PASS=true`
-
-Unset `BASH_IT_LEGACY_PASS` to have Bash-it **return to default behavior**:
-
-* `unset BASH_IT_LEGACY_PASS`
-
-### Debugging
-
-If you encounter problems with any part of Bash-it, run the following command:
-```bash
-bash-it doctor
-```
-This will reload your bash profile and print out logs of various parts in Bash-it.
-Note that this command at default will print all logs, including debug logs.
-You can call it like this:
-```bash
-bash-it doctor [errors/warnings/all]
-```
-In order to get wanted verbosity.
-
-### Proxy Support
-
-If you are working in a corporate environment where you have to go through a proxy server for internet access,
-then you know how painful it is to configure the OS proxy variables in the shell,
-especially if you are switching between environments, e.g. office (with proxy) and home (without proxy).
-
-The Bash shell (and many shell tools) use the following variables to define the proxy to use:
-
-* `HTTP_PROXY` (and `http_proxy`): Defines the proxy server for HTTP requests
-* `HTTPS_PROXY` (and `https_proxy`): Defines the proxy server for HTTPS requests
-* `ALL_PROXY` (and `all_proxy`): Used by some tools for the same purpose as above
-* `NO_PROXY` (and `no_proxy`): Comma-separated list of hostnames that don't have to go through the proxy
-
-Bash-it's `proxy` plugin allows to enable and disable these variables with a simple command.
-To start using the `proxy` plugin, run the following:
-
-```bash
-bash-it enable plugin proxy
-```
-
-Bash-it also provides support for enabling/disabling proxy settings for various shell tools.
-The following backends are currently supported (in addition to the shell's environment variables): Git, SVN, npm, ssh.
-The `proxy` plugin changes the configuration files of these tools to enable or disable the proxy settings.
-
-Bash-it uses the following variables to set the shell's proxy settings when you call `enable-proxy`.
-These variables are best defined in a custom script in Bash-it's custom script folder (`$BASH_IT/custom`), e.g. `$BASH_IT/custom/proxy.env.bash`
-* `BASH_IT_HTTP_PROXY` and `BASH_IT_HTTPS_PROXY`: Define the proxy URL to be used, e.g. 'http://localhost:1234'
-* `BASH_IT_NO_PROXY`: A comma-separated list of proxy exclusions, e.g. `127.0.0.1,localhost`
-
-Once you have defined these variables (and have run `reload` to load the changes), you can use the following commands to enable or disable the proxy settings in your current shell:
-
-* `enable-proxy`: This sets the shell's proxy environment variables and configures proxy support in your SVN, npm, and SSH configuration files.
-* `disable-proxy`: This unsets the shell's proxy environment variables and disables proxy support in your SVN, npm, and SSH configuration files.
-
-There are many more proxy commands, e.g. for changing the local Git project's proxy settings.
-Run `glossary proxy` to show the available proxy functions with a short description.
-
-## Help out
-
-We think everyone has their own custom scripts accumulated over time.
-And so, following in the footsteps of oh-my-zsh, Bash-it is a framework for easily customizing your Bash shell.
-Everyone's got a custom toolbox, so let's start making them even better, **as a community!**
-
-Send us a pull request and we'll merge it as long as it looks good.
-If you change an existing command, please give an explanation why.
-That will help a lot when we merge your changes in.
-
-Please take a look at the [Contribution Guidelines](CONTRIBUTING.md) before reporting a bug or providing a new feature.
-
-Thanks, and happing bashing!
-
-
 ## Contributors
 
 * [List of contributors][contribute]
 
 [contribute]: https://github.com/Bash-it/bash-it/contributors
-[pass password manager]: http://www.passwordstore.org/
diff --git a/test/README.md b/test/README.md
deleted file mode 100644
index 0b19fc0f..00000000
--- a/test/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Testing with Bats
-
-## Overview
-
-The Bash-it unit tests leverage the [Bats unit test framework for Bash](https://github.com/bats-core/bats-core).
-There is no need to install Bats explicitly, the test run script will automatically download and install Bats and its dependencies.
-
-When making changes to Bash-it, the tests are automatically executed in a test build environment on [Travis CI](https://travis-ci.com).
-
-## Test Execution
-
-To execute the unit tests, please run the `run` script:
-
-```bash
-# If you are in the `test` directory:
-./run
-
-# If you are in the root `.bash_it` directory:
-test/run
-```
-
-The `run` script will automatically install if it is not already present, and will then run all tests found under the `test` directory, including subdirectories.
-
-To run only a subset of the tests, you can provide the name of the test subdirectory that you want to run, e.g. like this for the tests in the `test/themes` directory:
-
-```bash
-# If you are in the root `.bash_it` directory:
-test/run test/themes
-```
-
-By default, the tests run in single-threaded mode.
-If you want to speed up the test execution, you can install the [GNU `parallel` tool](https://www.gnu.org/software/parallel/), which is supported by Bats.
-When using `parallel`, the `test/run` script will use a number of threads in parallel, depending on the available CPU cores of your system.
-This can speed up test execution significantly.
-
-## Writing Tests
-
-When adding or modifying tests, please stick to the format and conventions of the existing test cases.
-The `test_helper.bash` script provides a couple of reusable helper functions that you should use when writing a test case,
-for example for setting up an isolated test environment.

From 72f5c2ada07c6cc33e19c4dd97eb4b03b6f70393 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 6 Nov 2020 19:16:47 +0200
Subject: [PATCH 360/388] Move README to be under docs/

---
 README.md => docs/README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README.md => docs/README.md (100%)

diff --git a/README.md b/docs/README.md
similarity index 100%
rename from README.md
rename to docs/README.md

From 889259dfec3df435539841c188321b64ec804e78 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Sun, 8 Nov 2020 17:33:21 +0200
Subject: [PATCH 361/388] Cut 30s vrom the knife completion init time.

---
 completion/available/knife.completion.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/completion/available/knife.completion.bash b/completion/available/knife.completion.bash
index 6316ce08..def1ccaa 100644
--- a/completion/available/knife.completion.bash
+++ b/completion/available/knife.completion.bash
@@ -98,7 +98,8 @@ _KAC_clean_cache()
 }
 
 # perform a cache cleaning when loading this file
-_KAC_clean_cache
+# On big systems this could baloon up to a 30 second run or more, so not enabling by default.
+[[ "${KNIFE_CACHE_CLEAN}" ]] && _KAC_clean_cache
 
 #####################################
 ### End of cache helper functions ###

From 689758cf7122b26c9c42e59c93fb56403b0ce282 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Sun, 8 Nov 2020 17:40:45 +0200
Subject: [PATCH 362/388] pre-commit fixes.

---
 completion/available/knife.completion.bash | 238 ++++++++++-----------
 1 file changed, 111 insertions(+), 127 deletions(-)

diff --git a/completion/available/knife.completion.bash b/completion/available/knife.completion.bash
index def1ccaa..191e428c 100644
--- a/completion/available/knife.completion.bash
+++ b/completion/available/knife.completion.bash
@@ -31,70 +31,62 @@ stat -c %Y /dev/null > /dev/null 2>&1 && _KAC_STAT_COMMAND="stat -c %Y" || _KAC_
 # returns 0 iff the file whose path is given as 1st argument
 # exists and has last been modified in the last $2 seconds
 # returns 1 otherwise
-_KAC_is_file_newer_than()
-{
-    [ -f "$1" ] || return 1
-    [ $(( $(date +%s) - $($_KAC_STAT_COMMAND "$1") )) -gt $2 ] && return 1 || return 0
+_KAC_is_file_newer_than() {
+	[ -f "$1" ] || return 1
+	[ $(($(date +%s) - $($_KAC_STAT_COMMAND "$1"))) -gt $2 ] && return 1 || return 0
 }
 
 # helper function for _KAC_get_and_regen_cache, see doc below
-_KAC_regen_cache()
-{
-    local CACHE_NAME=$1
-    local CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
-    local TMP_FILE=$(mktemp "$_KAC_CACHE_TMP_DIR/$CACHE_NAME.XXXX")
-    shift 1
-    "$@" > $TMP_FILE 2> /dev/null
-    # discard the temp file if it's empty AND the previous command didn't exit successfully, but still mark the cache as updated
-    [[ $? != 0 ]] && [[ $(cat $TMP_FILE | wc -l) == 0 ]] && rm -f $TMP_FILE && touch $CACHE_PATH && return 1 \
-    || mv -f $TMP_FILE $CACHE_PATH
+_KAC_regen_cache() {
+	local CACHE_NAME=$1
+	local CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
+	local TMP_FILE=$(mktemp "$_KAC_CACHE_TMP_DIR/$CACHE_NAME.XXXX")
+	shift 1
+	"$@" > $TMP_FILE 2> /dev/null
+	# discard the temp file if it's empty AND the previous command didn't exit successfully, but still mark the cache as updated
+	[[ $? != 0 ]] && [[ $(cat $TMP_FILE | wc -l) == 0 ]] && rm -f $TMP_FILE && touch $CACHE_PATH && return 1 \
+		|| mv -f $TMP_FILE $CACHE_PATH
 }
 
 # cached files can't have spaces in their names
-_KAC_get_cache_name_from_command()
-{
-    echo "$@" | sed 's/ /_SPACE_/g'
+_KAC_get_cache_name_from_command() {
+	echo "$@" | sed 's/ /_SPACE_/g'
 }
 
 # the reverse operation from the function above
-_KAC_get_command_from_cache_name()
-{
-    echo "$@" | sed 's/_SPACE_/ /g'
+_KAC_get_command_from_cache_name() {
+	echo "$@" | sed 's/_SPACE_/ /g'
 }
 
 # given a command as argument, it fetches the cache for that command if it can find it
 # otherwise it waits for the cache to be generated
 # in either case, it regenerates the cache, and sets the _KAC_CACHE_PATH env variable
 # for obvious reason, do NOT call that in a sub-shell (in particular, no piping)
-_KAC_get_and_regen_cache()
-{
-    # the cache name can't have space in it
-    local CACHE_NAME=$(_KAC_get_cache_name_from_command "$@")
-    local REGEN_CMD="_KAC_regen_cache $CACHE_NAME $@"
-    _KAC_CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
-    # no need to wait for the regen if the file already exists
-    [ -f $_KAC_CACHE_PATH ] && ($REGEN_CMD &) || $REGEN_CMD
+_KAC_get_and_regen_cache() {
+	# the cache name can't have space in it
+	local CACHE_NAME=$(_KAC_get_cache_name_from_command "$@")
+	local REGEN_CMD="_KAC_regen_cache $CACHE_NAME $@"
+	_KAC_CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
+	# no need to wait for the regen if the file already exists
+	[ -f $_KAC_CACHE_PATH ] && ($REGEN_CMD &) || $REGEN_CMD
 }
 
 # performs two things: first, deletes all obsolete temp files
 # then refreshes stale caches that haven't been called in a long time
-_KAC_clean_cache()
-{
-    local FILE CMD
-    # delete all obsolete temp files, could be lingering there for any kind of crash in the caching process
-    for FILE in $(ls $_KAC_CACHE_TMP_DIR)
-    do
-        _KAC_is_file_newer_than $FILE $_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE || rm -f $FILE
-    done
-    # refresh really stale caches
-    for FILE in $(find $_KNIFE_AUTOCOMPLETE_CACHE_DIR -maxdepth 1 -type f -not -name '.*')
-    do
-        _KAC_is_file_newer_than $FILE $_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE && continue
-        # first let's get the original command
-        CMD=$(_KAC_get_command_from_cache_name $(basename "$FILE"))
-        # then regen the cache
-        _KAC_get_and_regen_cache "$CMD" > /dev/null
-    done
+_KAC_clean_cache() {
+	local FILE CMD
+	# delete all obsolete temp files, could be lingering there for any kind of crash in the caching process
+	for FILE in $(ls $_KAC_CACHE_TMP_DIR); do
+		_KAC_is_file_newer_than $FILE $_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE || rm -f $FILE
+	done
+	# refresh really stale caches
+	for FILE in $(find $_KNIFE_AUTOCOMPLETE_CACHE_DIR -maxdepth 1 -type f -not -name '.*'); do
+		_KAC_is_file_newer_than $FILE $_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE && continue
+		# first let's get the original command
+		CMD=$(_KAC_get_command_from_cache_name $(basename "$FILE"))
+		# then regen the cache
+		_KAC_get_and_regen_cache "$CMD" > /dev/null
+	done
 }
 
 # perform a cache cleaning when loading this file
@@ -105,103 +97,95 @@ _KAC_clean_cache()
 ### End of cache helper functions ###
 #####################################
 
-
 # returns all the possible knife sub-commands
-_KAC_knife_commands()
-{
-    knife --help | grep -E "^knife" | sed -E 's/ \(options\)//g'
+_KAC_knife_commands() {
+	knife --help | grep -E "^knife" | sed -E 's/ \(options\)//g'
 }
 
 # rebuilds the knife base command currently being completed, and assigns it to $_KAC_CURRENT_COMMAND
 # additionnally, returns 1 iff the current base command is not complete, 0 otherwise
 # also sets $_KAC_CURRENT_COMMAND_NB_WORDS if the base command is complete
-_KAC_get_current_base_command()
-{
-    local PREVIOUS="knife"
-    local I=1
-    local CURRENT
-    while [ $I -le $COMP_CWORD ]
-    do
-        # command words are all lower-case
-        echo ${COMP_WORDS[$I]} | grep -E "^[a-z]+$" > /dev/null || break
-        CURRENT="$PREVIOUS ${COMP_WORDS[$I]}"
-        cat $_KAC_CACHE_PATH | grep -E "^$CURRENT" > /dev/null || break
-        PREVIOUS=$CURRENT
-        I=$(( $I + 1))
-    done
-    _KAC_CURRENT_COMMAND=$PREVIOUS
-    [ $I -le $COMP_CWORD ] && _KAC_CURRENT_COMMAND_NB_WORDS=$I
+_KAC_get_current_base_command() {
+	local PREVIOUS="knife"
+	local I=1
+	local CURRENT
+	while [ $I -le $COMP_CWORD ]; do
+		# command words are all lower-case
+		echo ${COMP_WORDS[$I]} | grep -E "^[a-z]+$" > /dev/null || break
+		CURRENT="$PREVIOUS ${COMP_WORDS[$I]}"
+		cat $_KAC_CACHE_PATH | grep -E "^$CURRENT" > /dev/null || break
+		PREVIOUS=$CURRENT
+		I=$(($I + 1))
+	done
+	_KAC_CURRENT_COMMAND=$PREVIOUS
+	[ $I -le $COMP_CWORD ] && _KAC_CURRENT_COMMAND_NB_WORDS=$I
 }
 
 # searches the position of the currently completed argument in the current base command
 # (i.e. handles "plural" arguments such as knife cookbook upload cookbook1 cookbook2 and so on...)
 # assumes the current base command is complete
-_KAC_get_current_arg_position()
-{
-    local CURRENT_ARG_POS=$(( $_KAC_CURRENT_COMMAND_NB_WORDS + 1 ))
-    local COMPLETE_COMMAND=$(cat $_KAC_CACHE_PATH | grep -E "^$_KAC_CURRENT_COMMAND")
-    local CURRENT_ARG
-    while [ $CURRENT_ARG_POS -le $COMP_CWORD ]
-    do
-        CURRENT_ARG=$(echo $COMPLETE_COMMAND | cut -d ' ' -f $CURRENT_ARG_POS)
-        # we break if the current arg is a "plural" arg
-        echo $CURRENT_ARG | grep -E "^\\[[^]]+(\\.\\.\\.\\]|$)" > /dev/null && break
-        CURRENT_ARG_POS=$(( $CURRENT_ARG_POS + 1 ))
-    done
-    echo $CURRENT_ARG_POS
+_KAC_get_current_arg_position() {
+	local CURRENT_ARG_POS=$(($_KAC_CURRENT_COMMAND_NB_WORDS + 1))
+	local COMPLETE_COMMAND=$(cat $_KAC_CACHE_PATH | grep -E "^$_KAC_CURRENT_COMMAND")
+	local CURRENT_ARG
+	while [ $CURRENT_ARG_POS -le $COMP_CWORD ]; do
+		CURRENT_ARG=$(echo $COMPLETE_COMMAND | cut -d ' ' -f $CURRENT_ARG_POS)
+		# we break if the current arg is a "plural" arg
+		echo $CURRENT_ARG | grep -E "^\\[[^]]+(\\.\\.\\.\\]|$)" > /dev/null && break
+		CURRENT_ARG_POS=$(($CURRENT_ARG_POS + 1))
+	done
+	echo $CURRENT_ARG_POS
 }
 
 # the actual auto-complete function
-_knife()
-{
-    _KAC_get_and_regen_cache _KAC_knife_commands
-    local RAW_LIST ITEM REGEN_CMD ARG_POSITION
-    COMREPLY=()
-    # get correct command & arg pos
-    _KAC_get_current_base_command && ARG_POSITION=$(_KAC_get_current_arg_position) || ARG_POSITION=$(( $COMP_CWORD + 1 ))
-    RAW_LIST=$(cat $_KAC_CACHE_PATH | grep -E "^$_KAC_CURRENT_COMMAND" | cut -d ' ' -f $ARG_POSITION | uniq)
+_knife() {
+	_KAC_get_and_regen_cache _KAC_knife_commands
+	local RAW_LIST ITEM REGEN_CMD ARG_POSITION
+	COMREPLY=()
+	# get correct command & arg pos
+	_KAC_get_current_base_command && ARG_POSITION=$(_KAC_get_current_arg_position) || ARG_POSITION=$(($COMP_CWORD + 1))
+	RAW_LIST=$(cat $_KAC_CACHE_PATH | grep -E "^$_KAC_CURRENT_COMMAND" | cut -d ' ' -f $ARG_POSITION | uniq)
 
-    # we need to process that raw list a bit, most notably for placeholders
-    # NOTE: I chose to explicitely fetch & cache _certain_ informations for the server (cookbooks & node names, etc)
-    # as opposed to a generic approach by trying to find a 'list' knife command corresponding to the
-    # current base command - that might limit my script in some situation, but that way I'm sure it caches only
-    # not-sensitive stuff (a generic approach could be pretty bad e.g. with the knife-rackspace plugin)
-    LIST=""
-    for ITEM in $RAW_LIST
-    do
-        # always relevant if only lower-case chars : continuation of the base command
-        echo $ITEM | grep -E "^[a-z]+$" > /dev/null && LIST="$LIST $ITEM" && continue
-        case $ITEM in
-            *COOKBOOK*)
-                # special case for cookbooks : from site or local
-                [[ ${COMP_WORDS[2]} == 'site' ]] && REGEN_CMD="knife cookbook site list" || REGEN_CMD="knife cookbook list"
-                _KAC_get_and_regen_cache $REGEN_CMD
-                LIST="$LIST $(cat $_KAC_CACHE_PATH | cut -d ' ' -f 1)"
-                continue
-                ;;
-            *ITEM*)
-                # data bag item : another special case
-                local DATA_BAG_NAME=${COMP_WORDS[$(( COMP_CWORD-1 ))]}
-                REGEN_CMD="knife data bag show $DATA_BAG_NAME"
-                ;;
-            *INDEX*)
-                # see doc @ http://docs.opscode.com/knife_search.html
-                LIST="$LIST client environment node role"
-                REGEN_CMD="knife data bag list"
-                ;;
-            *BAG*) REGEN_CMD="knife data bag list";;
-            *CLIENT*) REGEN_CMD="knife client list";;
-            *NODE*) REGEN_CMD="knife node list";;
-            *ENVIRONMENT*) REGEN_CMD="knife environment list";;
-            *ROLE*) REGEN_CMD="knife role list";;
-            *USER*) REGEN_CMD="knife user list";;
-            # not a generic argument we support...
-            *) continue;;
-        esac
-        _KAC_get_and_regen_cache $REGEN_CMD
-        LIST="$LIST $(cat $_KAC_CACHE_PATH)"
-    done
-    COMPREPLY=( $(compgen -W "${LIST}" -- ${COMP_WORDS[COMP_CWORD]}))
+	# we need to process that raw list a bit, most notably for placeholders
+	# NOTE: I chose to explicitely fetch & cache _certain_ informations for the server (cookbooks & node names, etc)
+	# as opposed to a generic approach by trying to find a 'list' knife command corresponding to the
+	# current base command - that might limit my script in some situation, but that way I'm sure it caches only
+	# not-sensitive stuff (a generic approach could be pretty bad e.g. with the knife-rackspace plugin)
+	LIST=""
+	for ITEM in $RAW_LIST; do
+		# always relevant if only lower-case chars : continuation of the base command
+		echo $ITEM | grep -E "^[a-z]+$" > /dev/null && LIST="$LIST $ITEM" && continue
+		case $ITEM in
+			*COOKBOOK*)
+				# special case for cookbooks : from site or local
+				[[ ${COMP_WORDS[2]} == 'site' ]] && REGEN_CMD="knife cookbook site list" || REGEN_CMD="knife cookbook list"
+				_KAC_get_and_regen_cache $REGEN_CMD
+				LIST="$LIST $(cat $_KAC_CACHE_PATH | cut -d ' ' -f 1)"
+				continue
+				;;
+			*ITEM*)
+				# data bag item : another special case
+				local DATA_BAG_NAME=${COMP_WORDS[$((COMP_CWORD - 1))]}
+				REGEN_CMD="knife data bag show $DATA_BAG_NAME"
+				;;
+			*INDEX*)
+				# see doc @ http://docs.opscode.com/knife_search.html
+				LIST="$LIST client environment node role"
+				REGEN_CMD="knife data bag list"
+				;;
+			*BAG*) REGEN_CMD="knife data bag list" ;;
+			*CLIENT*) REGEN_CMD="knife client list" ;;
+			*NODE*) REGEN_CMD="knife node list" ;;
+			*ENVIRONMENT*) REGEN_CMD="knife environment list" ;;
+			*ROLE*) REGEN_CMD="knife role list" ;;
+			*USER*) REGEN_CMD="knife user list" ;;
+			# not a generic argument we support...
+			*) continue ;;
+		esac
+		_KAC_get_and_regen_cache $REGEN_CMD
+		LIST="$LIST $(cat $_KAC_CACHE_PATH)"
+	done
+	COMPREPLY=($(compgen -W "${LIST}" -- ${COMP_WORDS[COMP_CWORD]}))
 }
 
 #complete -f -F _knife knife

From f5fe3dbeb057d4a139e6dca14c571a34ab1fa34b Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Sun, 8 Nov 2020 17:57:54 +0200
Subject: [PATCH 363/388] shell-check fixes

---
 completion/available/knife.completion.bash | 77 ++++++++++++----------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/completion/available/knife.completion.bash b/completion/available/knife.completion.bash
index 191e428c..9b370209 100644
--- a/completion/available/knife.completion.bash
+++ b/completion/available/knife.completion.bash
@@ -19,7 +19,7 @@ _KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE=86400
 ### init
 _KAC_CACHE_TMP_DIR="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/tmp"
 # make sure the cache dir exists
-mkdir -p $_KAC_CACHE_TMP_DIR
+mkdir -p "$_KAC_CACHE_TMP_DIR"
 
 ##############################
 ### Cache helper functions ###
@@ -33,7 +33,7 @@ stat -c %Y /dev/null > /dev/null 2>&1 && _KAC_STAT_COMMAND="stat -c %Y" || _KAC_
 # returns 1 otherwise
 _KAC_is_file_newer_than() {
 	[ -f "$1" ] || return 1
-	[ $(($(date +%s) - $($_KAC_STAT_COMMAND "$1"))) -gt $2 ] && return 1 || return 0
+	[ $(($(date +%s) - $($_KAC_STAT_COMMAND "$1"))) -gt "$2" ] && return 1 || return 0
 }
 
 # helper function for _KAC_get_and_regen_cache, see doc below
@@ -42,10 +42,10 @@ _KAC_regen_cache() {
 	local CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
 	local TMP_FILE=$(mktemp "$_KAC_CACHE_TMP_DIR/$CACHE_NAME.XXXX")
 	shift 1
-	"$@" > $TMP_FILE 2> /dev/null
+	"$@" > "$TMP_FILE" 2> /dev/null
 	# discard the temp file if it's empty AND the previous command didn't exit successfully, but still mark the cache as updated
-	[[ $? != 0 ]] && [[ $(cat $TMP_FILE | wc -l) == 0 ]] && rm -f $TMP_FILE && touch $CACHE_PATH && return 1 \
-		|| mv -f $TMP_FILE $CACHE_PATH
+	[[ $? != 0 ]] && [[ $(wc -l "$TMP_FILE") == 0 ]] && rm -f "$TMP_FILE" && touch "$CACHE_PATH" && return 1 \
+		|| mv -f "$TMP_FILE" "$CACHE_PATH"
 }
 
 # cached files can't have spaces in their names
@@ -65,10 +65,14 @@ _KAC_get_command_from_cache_name() {
 _KAC_get_and_regen_cache() {
 	# the cache name can't have space in it
 	local CACHE_NAME=$(_KAC_get_cache_name_from_command "$@")
-	local REGEN_CMD="_KAC_regen_cache $CACHE_NAME $@"
+	local REGEN_CMD="_KAC_regen_cache $CACHE_NAME $*"
 	_KAC_CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
 	# no need to wait for the regen if the file already exists
-	[ -f $_KAC_CACHE_PATH ] && ($REGEN_CMD &) || $REGEN_CMD
+	if [[ -f "$_KAC_CACHE_PATH" ]]; then
+		($REGEN_CMD &)
+	else
+		$REGEN_CMD
+	fi
 }
 
 # performs two things: first, deletes all obsolete temp files
@@ -76,17 +80,18 @@ _KAC_get_and_regen_cache() {
 _KAC_clean_cache() {
 	local FILE CMD
 	# delete all obsolete temp files, could be lingering there for any kind of crash in the caching process
-	for FILE in $(ls $_KAC_CACHE_TMP_DIR); do
-		_KAC_is_file_newer_than $FILE $_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE || rm -f $FILE
+	for FILE in $(\ls "$_KAC_CACHE_TMP_DIR"); do
+		_KAC_is_file_newer_than "$FILE" "$_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE" || rm -f "$FILE"
 	done
 	# refresh really stale caches
-	for FILE in $(find $_KNIFE_AUTOCOMPLETE_CACHE_DIR -maxdepth 1 -type f -not -name '.*'); do
-		_KAC_is_file_newer_than $FILE $_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE && continue
-		# first let's get the original command
-		CMD=$(_KAC_get_command_from_cache_name $(basename "$FILE"))
-		# then regen the cache
-		_KAC_get_and_regen_cache "$CMD" > /dev/null
-	done
+	find "$_KNIFE_AUTOCOMPLETE_CACHE_DIR" -maxdepth 1 -type f -not -name '.*' \
+		| while read -r FILE; do
+			_KAC_is_file_newer_than "$FILE" "$_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE" && continue
+			# first let's get the original command
+			CMD=$(_KAC_get_command_from_cache_name "$(basename "$FILE")")
+			# then regen the cache
+			_KAC_get_and_regen_cache "$CMD" > /dev/null
+		done
 }
 
 # perform a cache cleaning when loading this file
@@ -109,32 +114,32 @@ _KAC_get_current_base_command() {
 	local PREVIOUS="knife"
 	local I=1
 	local CURRENT
-	while [ $I -le $COMP_CWORD ]; do
+	while [ $I -le "$COMP_CWORD" ]; do
 		# command words are all lower-case
-		echo ${COMP_WORDS[$I]} | grep -E "^[a-z]+$" > /dev/null || break
+		echo "${COMP_WORDS[$I]}" | grep -E "^[a-z]+$" > /dev/null || break
 		CURRENT="$PREVIOUS ${COMP_WORDS[$I]}"
-		cat $_KAC_CACHE_PATH | grep -E "^$CURRENT" > /dev/null || break
+		grep -E "^$CURRENT" "$_KAC_CACHE_PATH" > /dev/null || break
 		PREVIOUS=$CURRENT
-		I=$(($I + 1))
+		I=$((I + 1))
 	done
 	_KAC_CURRENT_COMMAND=$PREVIOUS
-	[ $I -le $COMP_CWORD ] && _KAC_CURRENT_COMMAND_NB_WORDS=$I
+	[ $I -le "$COMP_CWORD" ] && _KAC_CURRENT_COMMAND_NB_WORDS=$I
 }
 
 # searches the position of the currently completed argument in the current base command
 # (i.e. handles "plural" arguments such as knife cookbook upload cookbook1 cookbook2 and so on...)
 # assumes the current base command is complete
 _KAC_get_current_arg_position() {
-	local CURRENT_ARG_POS=$(($_KAC_CURRENT_COMMAND_NB_WORDS + 1))
-	local COMPLETE_COMMAND=$(cat $_KAC_CACHE_PATH | grep -E "^$_KAC_CURRENT_COMMAND")
+	local CURRENT_ARG_POS=$((_KAC_CURRENT_COMMAND_NB_WORDS + 1))
+	local COMPLETE_COMMAND=$(grep -E "^$_KAC_CURRENT_COMMAND" "$_KAC_CACHE_PATH")
 	local CURRENT_ARG
-	while [ $CURRENT_ARG_POS -le $COMP_CWORD ]; do
-		CURRENT_ARG=$(echo $COMPLETE_COMMAND | cut -d ' ' -f $CURRENT_ARG_POS)
+	while [ "$CURRENT_ARG_POS" -le "$COMP_CWORD" ]; do
+		CURRENT_ARG=$(echo "$COMPLETE_COMMAND" | cut -d ' ' -f "$CURRENT_ARG_POS")
 		# we break if the current arg is a "plural" arg
-		echo $CURRENT_ARG | grep -E "^\\[[^]]+(\\.\\.\\.\\]|$)" > /dev/null && break
-		CURRENT_ARG_POS=$(($CURRENT_ARG_POS + 1))
+		echo "$CURRENT_ARG" | grep -E "^\\[[^]]+(\\.\\.\\.\\]|$)" > /dev/null && break
+		CURRENT_ARG_POS=$((CURRENT_ARG_POS + 1))
 	done
-	echo $CURRENT_ARG_POS
+	echo "$CURRENT_ARG_POS"
 }
 
 # the actual auto-complete function
@@ -143,8 +148,8 @@ _knife() {
 	local RAW_LIST ITEM REGEN_CMD ARG_POSITION
 	COMREPLY=()
 	# get correct command & arg pos
-	_KAC_get_current_base_command && ARG_POSITION=$(_KAC_get_current_arg_position) || ARG_POSITION=$(($COMP_CWORD + 1))
-	RAW_LIST=$(cat $_KAC_CACHE_PATH | grep -E "^$_KAC_CURRENT_COMMAND" | cut -d ' ' -f $ARG_POSITION | uniq)
+	_KAC_get_current_base_command && ARG_POSITION=$(_KAC_get_current_arg_position) || ARG_POSITION=$((COMP_CWORD + 1))
+	RAW_LIST=$(grep -E "^$_KAC_CURRENT_COMMAND" "$_KAC_CACHE_PATH" | cut -d ' ' -f $ARG_POSITION | uniq)
 
 	# we need to process that raw list a bit, most notably for placeholders
 	# NOTE: I chose to explicitely fetch & cache _certain_ informations for the server (cookbooks & node names, etc)
@@ -154,13 +159,13 @@ _knife() {
 	LIST=""
 	for ITEM in $RAW_LIST; do
 		# always relevant if only lower-case chars : continuation of the base command
-		echo $ITEM | grep -E "^[a-z]+$" > /dev/null && LIST="$LIST $ITEM" && continue
-		case $ITEM in
+		echo "$ITEM" | grep -E "^[a-z]+$" > /dev/null && LIST="$LIST $ITEM" && continue
+		case "$ITEM" in
 			*COOKBOOK*)
 				# special case for cookbooks : from site or local
 				[[ ${COMP_WORDS[2]} == 'site' ]] && REGEN_CMD="knife cookbook site list" || REGEN_CMD="knife cookbook list"
-				_KAC_get_and_regen_cache $REGEN_CMD
-				LIST="$LIST $(cat $_KAC_CACHE_PATH | cut -d ' ' -f 1)"
+				_KAC_get_and_regen_cache "$REGEN_CMD"
+				LIST="$LIST $(cut -d ' ' -f 1 < "$_KAC_CACHE_PATH")"
 				continue
 				;;
 			*ITEM*)
@@ -182,8 +187,8 @@ _knife() {
 			# not a generic argument we support...
 			*) continue ;;
 		esac
-		_KAC_get_and_regen_cache $REGEN_CMD
-		LIST="$LIST $(cat $_KAC_CACHE_PATH)"
+		_KAC_get_and_regen_cache "$REGEN_CMD"
+		LIST="$LIST $(cat "$_KAC_CACHE_PATH")"
 	done
 	COMPREPLY=($(compgen -W "${LIST}" -- ${COMP_WORDS[COMP_CWORD]}))
 }

From d84d6a8356f165e52744923ae06e597ec847ddc2 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Sun, 8 Nov 2020 18:48:29 +0200
Subject: [PATCH 364/388] Add a credit comment

---
 completion/available/knife.completion.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/completion/available/knife.completion.bash b/completion/available/knife.completion.bash
index 9b370209..8c6fef9b 100644
--- a/completion/available/knife.completion.bash
+++ b/completion/available/knife.completion.bash
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# Published originally as public domain code at https://github.com/wk8/knife-bash-autocomplete
+
 ##############
 ### CONFIG ###
 ##############

From 06b1ffecc0d3abe84a784103c5f9c8f7ae7b1ae9 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Thu, 19 Nov 2020 01:10:02 +0200
Subject: [PATCH 365/388] Add rustup completion

---
 completion/available/rustup.completion.bash | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 completion/available/rustup.completion.bash

diff --git a/completion/available/rustup.completion.bash b/completion/available/rustup.completion.bash
new file mode 100644
index 00000000..96822031
--- /dev/null
+++ b/completion/available/rustup.completion.bash
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# rustup (Rust toolchain installer) completion
+
+if _binary_exists rustup; then
+	eval "$(rustup completions bash)"
+fi

From b70da511f2685a055caf38fbc72a48766315bf57 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 20 Nov 2020 13:01:41 +0200
Subject: [PATCH 366/388] Add rustup completion to clean_files.txt

---
 clean_files.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/clean_files.txt b/clean_files.txt
index 0276d20b..52981cf4 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -27,3 +27,7 @@ lint_clean_files.sh
 #
 themes/90210
 themes/powerline
+
+# completions
+#
+completion/available/rustup.completion.bash

From 794f0e321e53f4658e9532ea7e2c801fbda5761c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Felipe=20S=C3=A1nchez?= <lfelipe1501@gmail.com>
Date: Thu, 26 Nov 2020 09:11:08 -0500
Subject: [PATCH 367/388] Update atomic.theme.bash

fixed the space error after hiding the scm
---
 themes/atomic/atomic.theme.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/atomic/atomic.theme.bash b/themes/atomic/atomic.theme.bash
index 5035d49f..129bcbb6 100644
--- a/themes/atomic/atomic.theme.bash
+++ b/themes/atomic/atomic.theme.bash
@@ -117,7 +117,7 @@ ___atomic_prompt_user_info() {
 
 ___atomic_prompt_dir() {
   color=${IRed}
-  box="[|]${normal}${Line}"
+  box="[|]${normal}"
   info="\w"
   printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
 }
@@ -125,7 +125,7 @@ ___atomic_prompt_dir() {
 ___atomic_prompt_scm() {
   [ "${THEME_SHOW_SCM}" != "true" ] && return
   color=$bold_green
-  box="[${IWhite}$(scm_char)] "
+  box="${Line}[${IWhite}$(scm_char)] "
   info="$(scm_prompt_info)"
   printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
 }

From 8ce9d8daa56de7998b853c1151c4faa291119145 Mon Sep 17 00:00:00 2001
From: Kan Li <likan999@users.noreply.github.com>
Date: Sat, 28 Nov 2020 12:05:36 -0800
Subject: [PATCH 368/388] Add in_toolbox prompt to powerline themes

[Toolbox](https://github.com/containers/toolbox) is an containerized
development environment. This commit adds a promot to powerline when it
is running inside a toolbox.
---
 themes/gitline/gitline.theme.bash              |  3 +++
 themes/gitline/powerline.base.bash             | 18 +++++++++++++-----
 themes/powerline-multiline/README.md           |  1 +
 .../powerline-multiline.theme.bash             |  3 +++
 themes/powerline-naked/README.md               |  1 +
 .../powerline-naked/powerline-naked.theme.bash |  3 +++
 themes/powerline-plain/README.md               |  1 +
 .../powerline-plain/powerline-plain.theme.bash |  3 +++
 themes/powerline/README.md                     |  1 +
 themes/powerline/powerline.base.bash           |  6 ++++++
 themes/powerline/powerline.theme.bash          |  3 +++
 themes/redline/redline.theme.bash              |  3 +++
 12 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash
index 995b8c07..ef0bdae0 100644
--- a/themes/gitline/gitline.theme.bash
+++ b/themes/gitline/gitline.theme.bash
@@ -64,5 +64,8 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
+IN_TOOLBOX_THEME_PROMPT_COLOR=125
+IN_TOOLBOX_THEME_PROMPT_TEXT=" "
+
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/gitline/powerline.base.bash b/themes/gitline/powerline.base.bash
index 0f8a3028..93be7d2f 100644
--- a/themes/gitline/powerline.base.bash
+++ b/themes/gitline/powerline.base.bash
@@ -120,13 +120,13 @@ function __powerline_cwd_prompt {
 }
 
 function __powerline_hostname_prompt {
-    local fg_color=206
+  local fg_color=206
 
-    echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}|${fg_color}"
+  echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}|${fg_color}"
 }
 
 function __powerline_wd_prompt {
-    local fg_color=206
+  local fg_color=206
 
   echo "\W|${CWD_THEME_PROMPT_COLOR}|${fg_color}"
 }
@@ -158,7 +158,7 @@ function __powerline_battery_prompt {
 }
 
 function __powerline_in_vim_prompt {
-    local fg_color=206
+  local fg_color=206
 
   if [ -n "$VIMRUNTIME" ]; then
     echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}|${fg_color}"
@@ -166,13 +166,21 @@ function __powerline_in_vim_prompt {
 }
 
 function __powerline_aws_profile_prompt {
-    local fg_color=206
+  local fg_color=206
 
   if [[ -n "${AWS_PROFILE}" ]]; then
     echo "${AWS_PROFILE_CHAR}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR}|${fg_color}"
   fi
 }
 
+function __powerline_in_toolbox_prompt {
+  local fg_color=206
+
+  if [[ -e /run/.toolboxenv ]]; then
+    echo "${IN_TOOLBOX_THEME_PROMPT_TEXT}|${IN_TOOLBOX_THEME_PROMPT_COLOR}|${fg_color}"
+  fi
+}
+
 function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index da66d4ef..2654ff1c 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -59,6 +59,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
+* `in_toolbox` - Show identifier if running inside a toolbox
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index 54651cb6..da874718 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -74,6 +74,9 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
+IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index ec3b8fac..debdc1bd 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -52,6 +52,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
+* `in_toolbox` - Show identifier if running inside a toolbox
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 5c5fed26..89713d4a 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -69,6 +69,9 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
+IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=254}
 
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 0a8a75ad..019078c4 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -50,6 +50,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
+* `in_toolbox` - Show identifier if running inside a toolbox
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index 6ae81a56..c65d5760 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -66,6 +66,9 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
+IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="Ⓣ "}
+
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 587e0788..251a1b50 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -58,6 +58,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
+* `in_toolbox` - Show identifier if running inside a toolbox
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index b2596793..aca9f1e3 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -169,6 +169,12 @@ function __powerline_aws_profile_prompt() {
 	fi
 }
 
+function __powerline_in_toolbox_prompt() {
+	if [[ -e /run/.toolboxenv ]]; then
+		echo "${IN_TOOLBOX_THEME_PROMPT_TEXT}|${IN_TOOLBOX_THEME_PROMPT_COLOR}"
+	fi
+}
+
 function __powerline_shlvl_prompt() {
 	if [[ "${SHLVL}" -gt 1 ]]; then
 		local prompt="${SHLVL_THEME_PROMPT_CHAR}"
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 1463d777..09fb6747 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -71,6 +71,9 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
+IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
 SHLVL_THEME_PROMPT_COLOR=${POWERLINE_SHLVL_COLOR:=${HOST_THEME_PROMPT_COLOR}}
diff --git a/themes/redline/redline.theme.bash b/themes/redline/redline.theme.bash
index 3d67e8a5..e1f2a283 100644
--- a/themes/redline/redline.theme.bash
+++ b/themes/redline/redline.theme.bash
@@ -55,6 +55,9 @@ THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
 IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
+IN_TOOLBOX_THEME_PROMPT_COLOR=125
+IN_TOOLBOX_THEME_PROMPT_TEXT=" "
+
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="python_venv ruby user_info hostname cwd scm"}
 
 safe_append_prompt_command __powerline_prompt_command

From c13850faa2a3eef8ac9f10bf62ad3c41e0f37f48 Mon Sep 17 00:00:00 2001
From: Kan Li <likan999@users.noreply.github.com>
Date: Sat, 28 Nov 2020 18:49:25 -0800
Subject: [PATCH 369/388] Address some comments.

---
 themes/gitline/gitline.theme.bash                         | 2 +-
 themes/gitline/powerline.base.bash                        | 2 +-
 themes/powerline-multiline/README.md                      | 2 +-
 themes/powerline-multiline/powerline-multiline.theme.bash | 2 +-
 themes/powerline-naked/README.md                          | 2 +-
 themes/powerline-naked/powerline-naked.theme.bash         | 2 +-
 themes/powerline-plain/README.md                          | 2 +-
 themes/powerline-plain/powerline-plain.theme.bash         | 2 +-
 themes/powerline/README.md                                | 2 +-
 themes/powerline/powerline.base.bash                      | 2 +-
 themes/powerline/powerline.theme.bash                     | 2 +-
 themes/redline/redline.theme.bash                         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash
index ef0bdae0..9a68f370 100644
--- a/themes/gitline/gitline.theme.bash
+++ b/themes/gitline/gitline.theme.bash
@@ -65,7 +65,7 @@ IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=125
-IN_TOOLBOX_THEME_PROMPT_TEXT=" "
+IN_TOOLBOX_THEME_PROMPT_TEXT="⬢ "
 
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/gitline/powerline.base.bash b/themes/gitline/powerline.base.bash
index 93be7d2f..4f6b17b0 100644
--- a/themes/gitline/powerline.base.bash
+++ b/themes/gitline/powerline.base.bash
@@ -176,7 +176,7 @@ function __powerline_aws_profile_prompt {
 function __powerline_in_toolbox_prompt {
   local fg_color=206
 
-  if [[ -e /run/.toolboxenv ]]; then
+  if [ -f /run/.containerenv ] && [ -f /run/.toolboxenv ]; then
     echo "${IN_TOOLBOX_THEME_PROMPT_TEXT}|${IN_TOOLBOX_THEME_PROMPT_COLOR}|${fg_color}"
   fi
 }
diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
index 2654ff1c..8f29f008 100644
--- a/themes/powerline-multiline/README.md
+++ b/themes/powerline-multiline/README.md
@@ -59,7 +59,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index da874718..a86eac3c 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -75,7 +75,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
index debdc1bd..bb709869 100644
--- a/themes/powerline-naked/README.md
+++ b/themes/powerline-naked/README.md
@@ -52,7 +52,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 89713d4a..7a5bd4ed 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -70,7 +70,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=254}
 
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
index 019078c4..bdd9fdd8 100644
--- a/themes/powerline-plain/README.md
+++ b/themes/powerline-plain/README.md
@@ -50,7 +50,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
index c65d5760..b2a290a5 100644
--- a/themes/powerline-plain/powerline-plain.theme.bash
+++ b/themes/powerline-plain/powerline-plain.theme.bash
@@ -67,7 +67,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="Ⓣ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
index 251a1b50..edb87de9 100644
--- a/themes/powerline/README.md
+++ b/themes/powerline/README.md
@@ -58,7 +58,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command
diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index aca9f1e3..38c5c895 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -170,7 +170,7 @@ function __powerline_aws_profile_prompt() {
 }
 
 function __powerline_in_toolbox_prompt() {
-	if [[ -e /run/.toolboxenv ]]; then
+	if [ -f /run/.containerenv ] && [ -f /run/.toolboxenv ]; then
 		echo "${IN_TOOLBOX_THEME_PROMPT_TEXT}|${IN_TOOLBOX_THEME_PROMPT_COLOR}"
 	fi
 }
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 09fb6747..83731614 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -72,7 +72,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 
diff --git a/themes/redline/redline.theme.bash b/themes/redline/redline.theme.bash
index e1f2a283..e8810106 100644
--- a/themes/redline/redline.theme.bash
+++ b/themes/redline/redline.theme.bash
@@ -56,7 +56,7 @@ IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=125
-IN_TOOLBOX_THEME_PROMPT_TEXT=" "
+IN_TOOLBOX_THEME_PROMPT_TEXT="⬢ "
 
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="python_venv ruby user_info hostname cwd scm"}
 

From 1702e0217ad921b75d945634d1e284aa4eb52fa4 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 31 Oct 2020 23:00:57 +0200
Subject: [PATCH 370/388] docs: Remove themes readmes

---
 themes/atomic/README.md                 | 166 ------------------------
 themes/barbuk/README.md                 | 106 ---------------
 themes/bira/README.md                   |   8 --
 themes/brainy/README.md                 | 123 ------------------
 themes/codeword/README.md               |  22 ----
 themes/nwinkler_random_colors/README.md |  28 ----
 themes/powerline-multiline/README.md    | 121 -----------------
 themes/powerline-naked/README.md        |  92 -------------
 themes/powerline-plain/README.md        |  91 -------------
 themes/powerline/README.md              |  98 --------------
 themes/radek/README.md                  |  19 ---
 themes/redline/README.md                |  43 ------
 12 files changed, 917 deletions(-)
 delete mode 100644 themes/atomic/README.md
 delete mode 100644 themes/barbuk/README.md
 delete mode 100644 themes/bira/README.md
 delete mode 100644 themes/brainy/README.md
 delete mode 100644 themes/codeword/README.md
 delete mode 100644 themes/nwinkler_random_colors/README.md
 delete mode 100644 themes/powerline-multiline/README.md
 delete mode 100644 themes/powerline-naked/README.md
 delete mode 100644 themes/powerline-plain/README.md
 delete mode 100644 themes/powerline/README.md
 delete mode 100644 themes/radek/README.md
 delete mode 100644 themes/redline/README.md

diff --git a/themes/atomic/README.md b/themes/atomic/README.md
deleted file mode 100644
index 60e20828..00000000
--- a/themes/atomic/README.md
+++ /dev/null
@@ -1,166 +0,0 @@
-# Atomic theme
-
-The Best ColorFull terminal prompt theme inspired by a number of themes and based on the theme of @MunifTanjim [`brainy`](../brainy/README.md).
-
-Supported on all operating systems.
-
-In constant maintenance and improvement
-
-![Atomic-Theme](https://raw.githubusercontent.com/lfelipe1501/lfelipe-projects/master/AtomicTheme.gif)
-
-## Install Theme
-
-### Manually
-
-You can install the theme manually by following these steps:
-Edit your modified config `~/.bashrc` file in order to customize Bash-it, set `BASH_IT_THEME` to the theme name `atomic`.
-
-Examples:
-
-```bash
-# Use the "atomic" theme
-export BASH_IT_THEME="atomic"
-```
-
-### Automatically via terminal
-
-1. You can install the theme automatically using the `sed` command from your Linux or OSX Terminal.
-2. On macOS, the ~/.bash_profile is used, not the ~/.bashrc.
-3. For installation on windows you should use [`Git-Bash`](https://git-for-windows.github.io/) or make sure the terminal emulator you use (ej: cygwin, mintty, etc) has the `sed` command installed.
-
-Command to execute For Windows and Linux:
-```bash
-# Set the "atomic" theme replacing the theme you are using of bash-it
-sed -i 's/'"$BASH_IT_THEME"'/atomic/g' ~/.bashrc
-```
-Command to execute for macOS:
-```bash
-# Set the "atomic" theme replacing the theme you are using of bash-it
-sed -i '' 's/'"$BASH_IT_THEME"'/atomic/g' ~/.bash_profile
-```
-
-## Features
-
-### Prompt Segments
-
-- Username & Hostname
-- Current Directory
-- SCM Information
-- Battery Charge
-- Clock
-- [Todo.txt](https://github.com/ginatrapani/todo.txt-cli) status
-- Ruby Environment
-- Python Environment
-- Exit Code
-
-### Others
-
-- Indicator for cached `sudo` credential
-- Indicator for abort (ctrl + C) the current task and regain user control
-- `atomic` command for showing/hiding various prompt segments on-the-fly
-
-## Configuration
-
-Various prompt segments can be shown/hidden or modified according to your choice. There are two ways for doing that:
-
-1. On-the-fly using `atomic` command
-2. Theme Environment Variables
-
-### On-the-fly using `atomic` command
-
-This theme provides a command for showing/hiding prompt segments.
-
-`atomic show <segment>`
-
-`atomic hide <segment>`
-
-Tab-completion for this command is enabled by default.
-
-Configuration specified by this command will only be applied to current and subsequent child shells.
-
-### Theme Environment Variables
-
-This is used for permanent settings that apply to all terminal sessions. You have to define the value of specific theme variables in your `bashrc` (or equivalent) file.
-
-The name of the variables are listed below along with their default values.
-
-#### User Information
-
-Indicator for cached `sudo` credential (see `sudo` manpage for more information):
-
-`THEME_SHOW_SUDO=true`
-
-#### SCM Information
-
-Information about SCM repository status:
-
-`THEME_SHOW_SCM=true`
-
-#### Ruby Environment
-
-Ruby environment version information:
-
-`THEME_SHOW_RUBY=false`
-
-#### Python Environment
-
-Python environment version information:
-
-`THEME_SHOW_PYTHON=false`
-
-#### ToDo.txt status
-
-[Todo.txt](https://github.com/ginatrapani/todo.txt-cli) status:
-
-`THEME_SHOW_TODO=false`
-
-#### Clock
-
-`THEME_SHOW_CLOCK=true`
-
-`THEME_CLOCK_COLOR=$bold_cyan`
-
-Format of the clock (see `date` manpage for more information):
-
-`THEME_CLOCK_FORMAT="%H:%M:%S"`
-
-#### Battery Charge
-
-Battery charge percentage:
-
-`THEME_SHOW_BATTERY=false`
-
-#### Exit Code
-
-Exit code of the last command:
-
-`THEME_SHOW_EXITCODE=true`
-
-## Prompt Segments Order
-
-Currently available prompt segments are:
-
-- battery
-- char
-- clock
-- dir
-- exitcode
-- python
-- ruby
-- scm
-- todo
-- user_info
-
-Three environment variables can be defined to rearrange the segments order. The default values are:
-
-`___ATOMIC_TOP_LEFT="user_info dir scm"`
-
-`___ATOMIC_TOP_RIGHT="exitcode python ruby todo clock battery"`
-
-`___ATOMIC_BOTTOM="char"`
-
-### Development by
-
-Developer / Author: [Luis Felipe Sánchez](https://github.com/lfelipe1501)
-
-This work is licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
deleted file mode 100644
index cfff155f..00000000
--- a/themes/barbuk/README.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# BarbUk theme
-
-A minimal theme with a clean git prompt
-
-## Provided Information
-
-* Current git remote tool logo (support: github, gitlab, bitbucket)
-* Current path (red when user is root)
-* Current git info
-* Last command exit code (only shown when the exit code is greater than 0)
-* user@hostname for ssh connection
-
-## Fonts and glyphs
-
-A font with SCM glyphs is required to display the default tool/host logos.
-You can use a font from https://www.nerdfonts.com/ or patch your own font with the tool
-provided by https://github.com/ryanoasis/nerd-fonts.
-
-You can also override the default variables if you want to use different glyphs or standard ASCII characters.
-
-### Default theme glyphs
-
-```bash
-BARBUK_GITLAB_CHAR='  '
-BARBUK_BITBUCKET_CHAR='  '
-BARBUK_GITHUB_CHAR='  '
-BARBUK_GIT_DEFAULT_CHAR='  '
-BARBUK_GIT_BRANCH_ICON=''
-BARBUK_HG_CHAR='☿ '
-BARBUK_SVN_CHAR='⑆ '
-BARBUK_EXIT_CODE_ICON=' '
-BARBUK_PYTHON_VENV_CHAR=' '
-```
-
-### Customize glyphs
-
-Define your custom glyphs before sourcing bash-it:
-
-```bash
-export BARBUK_GITHUB_CHAR='•'
-source "$BASH_IT"/bash_it.sh
-```
-
-## SSH prompt
-
-### Usage
-
-When using a ssh session, the theme will display `user@hostname`.
-You can disable this information with `BARBUK_SSH_INFO`.
-
-The hostname is displayed in the FQDN format by default. You
-can use the short hostname format with `BARBUK_HOST_INFO`.
-
-```bash
-# short or long
-export BARBUK_HOST_INFO=short
-# true or false
-export BARBUK_SSH_INFO=false
-source "$BASH_IT"/bash_it.sh
-```
-
-### Keep theme with sudoer
-
-If you want the theme to persist using `sudo -s` in a ssh session, you need to configure sudo to keep the `HOME` and `SSH_CONNECTION` environment variables.
-
-`HOME` contains the path to the home directory of the current user. Keeping it will allow to use your user dotfiles when elevating privileges.
-
-Keeping `SSH_CONNECTION` env is necessary for ssh detection in the theme.
-
-Please refer to the following documentation for more information:
- -  [sudo manual](https://www.sudo.ws/man/1.8.13/sudoers.man.html) for `env_keep` configuration
- -  [openssh manual](https://linux.die.net/man/1/ssh) for information about `SSH_CONNECTION` environment
-
-```bash
-cat << EOF > /etc/sudoers.d/keepenv
-Defaults env_keep += HOME
-Defaults env_keep += SSH_CONNECTION
-EOF
-chmod 400 /etc/sudoers.d/keepenv
-```
-
-## Examples
-
-### Clean
-
-```bash
- ~ ❯
-```
-
-### Git
-
-```bash
-   ~/.dotfiles on  master ⤏  origin ↑2 •7 ✗ ❯
-```
-
-### Ssh
-
-```bash
-user@hostname in  ~/bash-it on  master ✓ ❯
-```
-
-### Python venv
-
-```bash
-  flask ~/test on  master ✓ ❯
-```
diff --git a/themes/bira/README.md b/themes/bira/README.md
deleted file mode 100644
index 2438778e..00000000
--- a/themes/bira/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Bira
-
-This is a port of Oh My Zsh's ['Bira'](https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/bira.zsh-theme) theme. It looks the same as the original, except for the following changes:
-
-- Exit code of last command is not shown
-- More informative git prompt (if you want to keep it minimal, please read: https://github.com/Bash-it/bash-it#git-prompt)
-- Position and colour of virtualenv prompt
-- No ruby version prompt
diff --git a/themes/brainy/README.md b/themes/brainy/README.md
deleted file mode 100644
index dc6eaecd..00000000
--- a/themes/brainy/README.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# Brainy theme
-
-Simple colorful terminal prompt theme (inspired by a number of themes).
-
-## Features
-
-### Prompt Segments
-
-- Username & Hostname
-- Current Directory
-- SCM Information
-- Battery Charge
-- Clock
-- [Todo.txt](https://github.com/ginatrapani/todo.txt-cli) status
-- Ruby Environment
-- Python Environment
-- Exit Code
-
-### Others
-
-- Indicator for cached `sudo` credential
-- Indicator for ssh login
-- `brainy` command for showing/hiding various prompt segments on-the-fly
-
-## Configuration
-
-Various prompt segments can be shown/hidden or modified according to your choice. There are two ways for doing that:
-
-1. On-the-fly using `brainy` command
-2. Theme Environment Variables
-
-### On-the-fly using `brainy` command
-
-This theme provides a command for showing/hiding prompt segments.
-
-`brainy show <segment>`
-
-`brainy hide <segment>`
-
-Tab-completion for this command is enabled by default.
-
-Configuration specified by this command will only be applied to current and subsequent child shells.
-
-### Theme Environment Variables
-
-This is used for permanent settings that apply to all terminal sessions. You have to define the value of specific theme variables in your `bashrc` (or equivalent) file.
-
-The name of the variables are listed below along with their default values.
-
-#### User Information
-
-Indicator for cached `sudo` credential (see `sudo` manpage for more information):
-
-`THEME_SHOW_SUDO=true`
-
-#### SCM Information
-
-Information about SCM repository status:
-
-`THEME_SHOW_SCM=true`
-
-#### Ruby Environment
-
-Ruby environment version information:
-
-`THEME_SHOW_RUBY=false`
-
-#### Python Environment
-
-Python environment version information:
-
-`THEME_SHOW_PYTHON=false`
-
-#### ToDo.txt status
-
-[Todo.txt](https://github.com/ginatrapani/todo.txt-cli) status:
-
-`THEME_SHOW_TODO=false`
-
-#### Clock
-
-`THEME_SHOW_CLOCK=true`
-
-`THEME_CLOCK_COLOR=$bold_cyan`
-
-Format of the clock (see `date` manpage for more information):
-
-`THEME_CLOCK_FORMAT="%H:%M:%S"`
-
-#### Battery Charge
-
-Battery charge percentage:
-
-`THEME_SHOW_BATTERY=false`
-
-#### Exit Code
-
-Exit code of the last command:
-
-`THEME_SHOW_EXITCODE=true`
-
-## Prompt Segments Order
-
-Currently available prompt segments are:
-
-- battery
-- char
-- clock
-- dir
-- exitcode
-- python
-- ruby
-- scm
-- todo
-- user_info
-
-Three environment variables can be defined to rearrange the segments order. The default values are:
-
-`___BRAINY_TOP_LEFT="user_info dir scm"`
-
-`___BRAINY_TOP_RIGHT="python ruby todo clock battery"`
-
-`___BRAINY_BOTTOM="exitcode char"`
diff --git a/themes/codeword/README.md b/themes/codeword/README.md
deleted file mode 100644
index c0cb8944..00000000
--- a/themes/codeword/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Single line PS1 theme w/realtime history among windows
-
-
-Minimal theme overrides from bash_it base theming
-
-
-## `user@host:path[virt-env][scm] $`
-Breakdown of the segments:
-
-- **user@host:path** - *convienient for LAN based `ssh` and `scp` tasks*
-- [**virtualenv**] - *only appears when activated*
-- [**scm**] - *only appears when activated*
-- **marker** - *$ or # depending on current user*
-
-### Examples
-
-```bash
-user@example.lan:~ $ cd /tmp/foo/bar/baz
-user@example.lan:/tmp/foo/bar/baz $ cd $HOME/workspace
-user@example.lan:~/workspace $ cd sampleRepo/
-user@example.lan:~/workspace/sampleRepo [± |master ↑1 ↓3 {1} S:2 ?:1 ✗|] $
-```
diff --git a/themes/nwinkler_random_colors/README.md b/themes/nwinkler_random_colors/README.md
deleted file mode 100644
index 69bfcd69..00000000
--- a/themes/nwinkler_random_colors/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Nwinkler Random Color Theme
-
-## Description
-
-The *Nwinkler Random Color* Theme is based on the [nwinkler theme](https://github.com/Bash-it/bash-it/wiki/Themes#nwinkler), but it randomizes the colors for:
-
-* time
-* username
-* hostname
-* path
-
-The random colors are chosen the first time this theme is used and saved to the `~/.nwinkler_random_colors` file. So, the next time you connect to the same machine, you will get the same colors.
-
-To force new random colors to be selected, run the command:
-
-```sh
-randomize_nwinkler
-```
-
-## Screenshot
-
-Here it is in action:
-
-![alt text](screenshot.png "Nwinkler Random Color Theme in Action!")
-
-## Usage Scenario
-
-This theme is especially useful when connecting to many different machines and switching between them often. Yes, the hostname *is* present in the prompt. But I argue that it's a lot faster to get a "feel" of what machine you are currently on because of the custom colors on that machine's prompt than by reading the hostname.
diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
deleted file mode 100644
index 8f29f008..00000000
--- a/themes/powerline-multiline/README.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# Powerline Multiline Theme
-
-A colorful multiline theme, where the first line shows information about your shell session (divided into two parts, left and right), and the second one is where the shell commands are introduced.
-
-**IMPORTANT:** This theme requires that [a font with the Powerline symbols](https://github.com/powerline/fonts) needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
-
-## Provided Information
-
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (`pushd` / `popd`)
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the [../../plugins/available/battery.plugin.bash](battery plugin))
-* SCM Repository status (e.g. Git, SVN)
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-## Configuration
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-### User Information
-
-By default, the username and hostname are shown on the right hand side, but you can change this behavior by setting the value of the following variable:
-
-```bash
-export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-```
-
-For now, the only supported value is `sudo`, which hides the username and hostname, and shows an indicator when `sudo` has the credentials cached. Other values have no effect at this time.
-
-### Clock Format
-
-By default, the current time is shown on the right hand side, you can change the format using the following variable:
-
-```bash
-export THEME_CLOCK_FORMAT="%H:%M:%S"
-```
-
-The time/date is printed by the `date` command, so refer to its man page to change the format.
-
-### Soft Separators
-
-Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
-
-### Segment Order
-
-The contents of both prompt sides can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-* `aws_profile` - Show the current value of the `AWS_PROFILE` environment variable
-* `battery` - Battery information (you'll need to enable the `battery` plugin)
-* `clock` - Current time in `HH:MM:SS` format
-* `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
-* `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
-* `in_vim` - Show identifier if running in `:terminal` from vim
-* `k8s_context` - Show current kubernetes context
-* `last_status` - Exit status of last run command
-* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
-  and `conda` supported)
-* `ruby` - Current ruby version if using `rvm`
-* `node` - Current node version (only `nvm` is supported)
-* `scm` - Version control information, `git`
-* `terraform` - Current terraform workspace
-* `user_info` - Current user
-* `wd` - Working directory, like `cwd` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
-* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
-* `history_number` - Show current history number
-* `command_number` - Show current command number
-
-Two variables can be defined to set the order of the prompt segments:
-
-```bash
-export POWERLINE_LEFT_PROMPT="scm python_venv ruby cwd"
-export POWERLINE_RIGHT_PROMPT="in_vim clock battery user_info"
-```
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the corresponding variable.
-
-### Padding
-
-To get the length of the left and right segments right, a _padding_ value is used.
-In most cases, the default value (_2_) works fine, but on some operating systems, this needs to be adjusted.
-One example is _macOS High Sierra_, where the default padding causes the right segment to extend to the next line.
-On macOS High Sierra, the padding value needs to be changed to _3_ to make the theme look right.
-This can be done by setting the `POWERLINE_PADDING` variable before Bash-it is loaded, e.g. in your `~/.bash_profile` or `~/.bashrc` file:
-
-```bash
-export POWERLINE_PADDING=3
-```
-
-### Compact Settings
-
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
-
-| Variable                             | Description
-|--------------------------------------|------------
-|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
-|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
-|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
-|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
-|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
-|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
-
-The default value for all settings is `0` (disabled). Use `1` to enable.
-
-**Multiline Mode Right Prompt**
-
-For the purposes of the `Compact` settings, the segments within the **Right Prompt** are considered to run "right-to-left", i.e.:
-
-* The **right-most** segment is considered to be the `"first"` segment, while the **left-most** segment is considered to be the `"last"`
-* The space to the **right** of the separator character is considered to be `"before"`, while the space to the **left** is considered to be `"after"`
diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
deleted file mode 100644
index bb709869..00000000
--- a/themes/powerline-naked/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Powerline Theme
-
-A colorful theme, where shows a lot information about your shell session.
-
-**IMPORTANT:** This theme requires that [a font with the Powerline symbols](https://github.com/powerline/fonts) needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
-
-## Provided Information
-
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (`pushd` / `popd`)
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the [../../plugins/available/battery.plugin.bash](battery plugin))
-* SCM Repository status (e.g. Git, SVN)
-* The current Kubernetes environment
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-## Configuration
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-### User Information
-
-By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
-
-    POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-For now, the only supported value is `sudo`, which hides the username and hostname, and shows an indicator when `sudo` has the credentials cached. Other values have no effect at this time.
-
-### Clock Format
-
-You can change the format using the following variable:
-
-    THEME_CLOCK_FORMAT="%H:%M:%S"
-
-The time/date is printed by the `date` command, so refer to its man page to change the format.
-
-### Segment Order
-
-The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-* `aws_profile` - Show the current value of the `AWS_PROFILE` environment variable
-* `battery` - Battery information (you'll need to enable the `battery` plugin)
-* `clock` - Current time in `HH:MM:SS` format
-* `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
-* `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
-* `in_vim` - Show identifier if running in `:terminal` from vim
-* `k8s_context` - Show current kubernetes context
-* `last_status` - Exit status of last run command
-* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
-  and `conda` supported)
-* `ruby` - Current ruby version if using `rvm`
-* `node` - Current node version (only `nvm` is supported)
-* `scm` - Version control information, `git`
-* `terraform` - Current terraform workspace
-* `user_info` - Current user
-* `wd` - Working directory, like `cwd` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
-* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
-* `history_number` - Show current history number
-* `command_number` - Show current command number
-
-A variable can be defined to set the order of the prompt segments:
-
-    POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
-
-### Compact Settings
-
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
-
-| Variable                             | Description
-|--------------------------------------|------------
-|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
-|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
-|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
-|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
-|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
-|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
-
-The default value for all settings is `0` (disabled). Use `1` to enable.
diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
deleted file mode 100644
index bdd9fdd8..00000000
--- a/themes/powerline-plain/README.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Powerline Theme
-
-A colorful theme, where shows a lot information about your shell session.
-
-## Provided Information
-
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (`pushd` / `popd`)
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the [../../plugins/available/battery.plugin.bash](battery plugin))
-* SCM Repository status (e.g. Git, SVN)
-* The current Kubernetes environment
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-## Configuration
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-### User Information
-
-By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
-
-    POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-For now, the only supported value is `sudo`, which hides the username and hostname, and shows an indicator when `sudo` has the credentials cached. Other values have no effect at this time.
-
-### Clock Format
-
-You can change the format using the following variable:
-
-    THEME_CLOCK_FORMAT="%H:%M:%S"
-
-The time/date is printed by the `date` command, so refer to its man page to change the format.
-
-### Segment Order
-
-The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-* `aws_profile` - Show the current value of the `AWS_PROFILE` environment variable
-* `battery` - Battery information (you'll need to enable the `battery` plugin)
-* `clock` - Current time in `HH:MM:SS` format
-* `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
-* `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
-* `in_vim` - Show identifier if running in `:terminal` from vim
-* `k8s_context` - Show current kubernetes context
-* `last_status` - Exit status of last run command
-* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
-  and `conda` supported)
-* `ruby` - Current ruby version if using `rvm`
-* `node` - Current node version (only `nvm` is supported)
-* `scm` - Version control information, `git`
-* `terraform` - Current terraform workspace
-* `user_info` - Current user
-* `wd` - Working directory, like `cwd` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
-* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
-* `history_number` - Show current history number
-* `command_number` - Show current command number
-
-A variable can be defined to set the order of the prompt segments:
-
-    POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
-
-### Compact Settings
-
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
-
-| Variable                             | Description
-|--------------------------------------|------------
-|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
-|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
-|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
-|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
-|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
-|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
-|POWERLINE_PROMPT_AFTER                | Adds characters after the prompt
-
-The default value for all settings is `0` (disabled). Use `1` to enable.
diff --git a/themes/powerline/README.md b/themes/powerline/README.md
deleted file mode 100644
index edb87de9..00000000
--- a/themes/powerline/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Powerline Theme
-
-A colorful theme, where shows a lot information about your shell session.
-
-**IMPORTANT:** This theme requires that [a font with the Powerline symbols](https://github.com/powerline/fonts) needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
-
-**NOTICE:** The default behavior of this theme assumes that you have sudo privileges on your workstation. If that is not the case (e.g. if you are running on a corporate network where `sudo` usage is tracked), you can set the flag 'export THEME_CHECK_SUDO=false' in your `~/.bashrc` or `~/.bash_profile` to disable the Powerline theme's `sudo` check. This will apply to all `powerline*` themes.
-
-## Provided Information
-
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (`pushd` / `popd`)
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when `sudo` has the credentials cached (see the `sudo` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the [../../plugins/available/battery.plugin.bash](battery plugin))
-* SCM Repository status (e.g. Git, SVN)
-* The current Kubernetes environment
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-## Configuration
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-### User Information
-
-By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
-
-    POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-For now, the only supported value is `sudo`, which hides the username and hostname, and shows an indicator when `sudo` has the credentials cached. Other values have no effect at this time.
-
-### Clock Format
-
-You can change the format using the following variable:
-
-    THEME_CLOCK_FORMAT="%H:%M:%S"
-
-The time/date is printed by the `date` command, so refer to its man page to change the format.
-
-### Soft Separators
-
-Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
-
-### Segment Order
-
-The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-* `aws_profile` - Show the current value of the `AWS_PROFILE` environment variable
-* `battery` - Battery information (you'll need to enable the `battery` plugin)
-* `clock` - Current time in `HH:MM:SS` format
-* `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
-* `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
-* `in_vim` - Show identifier if running in `:terminal` from vim
-* `k8s_context` - Show current kubernetes context
-* `last_status` - Exit status of last run command
-* `python_venv` - Python virtual environment information (`virtualenv`, `venv`
-  and `conda` supported)
-* `ruby` - Current ruby version if using `rvm`
-* `node` - Current node version (only `nvm` is supported)
-* `scm` - Version control information, `git`
-* `terraform` - Current terraform workspace
-* `user_info` - Current user
-* `wd` - Working directory, like `cwd` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* `shlvl` - Show the current shell level (based on `SHLVL` environment variable), but only if you are not in root shell
-* `dirstack` - Show the current dirstack level (based on `DIRSTACK` environment variable), but only if the stack is not empty
-* `history_number` - Show current history number
-* `command_number` - Show current command number
-
-A variable can be defined to set the order of the prompt segments:
-
-    POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
-
-### Compact Settings
-
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
-
-| Variable                             | Description
-|--------------------------------------|------------
-|POWERLINE_COMPACT_BEFORE_SEPARATOR    | Removes the leading space before each separator
-|POWERLINE_COMPACT_AFTER_SEPARATOR     | Removes the trailing space after each separator
-|POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT | Removes the leading space on the first segment
-|POWERLINE_COMPACT_AFTER_LAST_SEGMENT  | Removes the trailing space on the last segment
-|POWERLINE_COMPACT_PROMPT              | Removes the space after the prompt character
-|POWERLINE_COMPACT                     | Enable all Compact settings (you can still override individual settings)
-
-The default value for all settings is `0` (disabled). Use `1` to enable.
diff --git a/themes/radek/README.md b/themes/radek/README.md
deleted file mode 100644
index 7dc521a2..00000000
--- a/themes/radek/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Radek Theme
-
-A colorful theme for Python developers.
-It does not have any requirments.
-
-## Provided Information
-
-* Current username and hostname
-* Current path
-* Git repository status
-* Current Python environment (venv, Conda )
-* Current Python version
-
-## Examples
-
-```bash
-[radek@photon][~/src/nokia2/cbis] ±[master → origin ↑1 {1}✓][venv-cbis][py-3.7.5]
-→
-```
diff --git a/themes/redline/README.md b/themes/redline/README.md
deleted file mode 100644
index 0705612e..00000000
--- a/themes/redline/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Redline Theme
-
-changed up the powerline base a little.
-
-It plays nicest with  this font: [DroidSansMonoForPowerline](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/DroidSansMono)
-
-Read the [powerline theme documentation](https://github.com/Bash-it/bash-it/blob/master/themes/powerline/README.md)
-
-
-## added
-* hostname
-* distro logo
-
-## changed
-* sudo credential check
-* required font
-* some icons
-
-Works real good like with:
-```bash
-## set the theme
-export BASH_IT_THEME='redline'
-
-# Set this to false to turn off version control status checking within the prompt for all themes
-export SCM_CHECK=true
-
-## Set Xterm/screen/Tmux title with only a short hostname.
-export SHORT_HOSTNAME=$(hostname -s)
-
-## enable sudo prompt
-export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-## prompt part string
-export POWERLINE_PROMPT="python_venv user_info hostname cwd scm"
-
-```
-
-## enable your distro logo with
-```bash
-export POWERLINE_PROMPT_DISTRO_LOGO="yes"
-```
-
-![screenshot](screenshot.png?raw=true)

From 8198fafbd934a854717f36288c50ae7fd1845086 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 4 Dec 2020 18:32:48 +0200
Subject: [PATCH 371/388] Add github action to replace travis

---
 .github/workflows/ci.yml | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..03b75882
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,60 @@
+name: CI
+
+# Triggers the workflow on push or pull request events
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  bats-test:
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, macos-10.15, macos-11.0]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install greadlink
+      if: startsWith(runner.os, 'macOS')
+      run: brew install coreutils
+    - name: Test code
+      run: test/run
+
+  build-docs:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install docs dependencies
+      run: python3 -m pip install -r docs/requirements.txt
+    - name: Build the docs
+      run: sphinx-build -W -b html docs docs/_build/html
+
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.14
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install shfmt
+      run: GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt
+    - name: Install shellcheck
+      run: brew install shellcheck
+    - name: Install pre-commit
+      run: python3 -m pip install -r test/lint-requirements.txt
+    - name: Run lint
+      run: ./lint_clean_files.sh

From 4a5ea95e2e778a847b5ff6af7ccae355f43974cf Mon Sep 17 00:00:00 2001
From: NariyasuHeseri <31871512+NariyasuHeseri@users.noreply.github.com>
Date: Sun, 6 Dec 2020 01:33:50 +0900
Subject: [PATCH 372/388] Add completion for pipx. (#1719)

* Add completion for pipx.

* Add pipx  completion to clean_files.txt.

* Format pipx.completion.bash to match the project's coding style.

* Format pipx.completion.bash with ./lint_clean_files.sh.
---
 clean_files.txt                           | 1 +
 completion/available/pipx.completion.bash | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 completion/available/pipx.completion.bash

diff --git a/clean_files.txt b/clean_files.txt
index 52981cf4..cade6895 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -31,3 +31,4 @@ themes/powerline
 # completions
 #
 completion/available/rustup.completion.bash
+completion/available/pipx.completion.bash
diff --git a/completion/available/pipx.completion.bash b/completion/available/pipx.completion.bash
new file mode 100644
index 00000000..9e34f076
--- /dev/null
+++ b/completion/available/pipx.completion.bash
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# pipx completion
+
+if _command_exists register-python-argcomplete && _command_exists pipx; then
+	eval "$(register-python-argcomplete pipx)"
+fi

From 4d51bfcaf42ea0413d1e65bdd42785b1e37c1207 Mon Sep 17 00:00:00 2001
From: Nariyasu Heseri <heserisiyookang@gmail.com>
Date: Sun, 6 Dec 2020 15:22:36 +0900
Subject: [PATCH 373/388] Add cargo completion

---
 clean_files.txt                            | 3 ++-
 completion/available/cargo.completion.bash | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 completion/available/cargo.completion.bash

diff --git a/clean_files.txt b/clean_files.txt
index cade6895..47ae7e93 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -30,5 +30,6 @@ themes/powerline
 
 # completions
 #
-completion/available/rustup.completion.bash
+completion/available/cargo.completion.bash
 completion/available/pipx.completion.bash
+completion/available/rustup.completion.bash
diff --git a/completion/available/cargo.completion.bash b/completion/available/cargo.completion.bash
new file mode 100644
index 00000000..46b399e4
--- /dev/null
+++ b/completion/available/cargo.completion.bash
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# cargo (Rust package manager) completion
+
+if _binary_exists rustup && _binary_exists cargo; then
+	eval "$(rustup completions bash cargo)"
+fi

From 7f1aa107d8874be6bd031fe21882015c543dcc3a Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 6 Dec 2020 21:43:59 +0200
Subject: [PATCH 374/388] ci: Delete travis settings as they no longer support
 OSS

Very sad indeed
---
 .travis.yml | 60 -----------------------------------------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d199e9d6..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# YAML anchors need to appear first.
-# Keys starting with an underscore are the custom ones, refer to
-# https://docs.travis-ci.com/user/build-config-yaml#private-keys-as-yaml-anchors-and-aliases-and-external-tooling
-
-_native_job: &native_job
-  script: |
-    test/run
-
-language: shell
-
-os: linux
-
-dist: xenial
-
-cache:
-  directories:
-  - "${HOME}/.cache/pip"
-  - "${HOME}/.cache/pre-commit"
-  - "${HOME}/.pre-commit-venv"
-  - "${HOME}/bin"
-  - /usr/lib/python3.8
-
-jobs:
-  include:
-  - language: python
-    python: 3.8
-    name: docs
-    dist: bionic
-    install:
-      pip3 install -r docs/requirements.txt;
-    script:
-      sphinx-build -W -b html docs docs/_build/html;
-
-  - language: go
-    go: "1.14"
-    name: pre-commit lint
-    dist: bionic
-    sudo: required
-    before_script:
-      GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt;
-      curl https://pre-commit.com/install-local.py | python3 -
-    script:
-      ./lint_clean_files.sh;
-
-  - <<: *native_job
-    name: Ubuntu 16.04
-
-  - <<: *native_job
-    name: Ubuntu 18.04
-    dist: bionic
-
-  - <<: *native_job
-    name: MacOS xcode9.4
-    os: osx
-    osx_image: xcode9.4 # Default xcode on Travis.
-
-  - <<: *native_job
-    name: MacOS xcode11.5
-    os: osx
-    osx_image: xcode11.5 # Latest xcode on Travis.

From 7dcf4dd186f58e6b2d1e2090dd3a0c762911e134 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 6 Dec 2020 23:02:16 +0200
Subject: [PATCH 375/388] Update contribution.rst

Now includes relevant change about `clean_files.txt` and improves the part about our coding style
---
 docs/contributing.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index e2c3f5ca..9964e03c 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -38,8 +38,9 @@ Code Style
 ----------
 
 
-* Try to stick to the existing code style. Please don't reformat or change the syntax of existing code simply because you don't like that style.
-* Indentation is using spaces, not tabs. Most of the code is indented with 2 spaces, some with 4 spaces. Please try to stick to 2 spaces.
+* When adding new files, be sure to add them into `clean_files.txt`, which is a growing list of linted files in the project.
+* When changing existing files, consider also adding them into `clean_files.txt` and fixing the linting errors that arise.
+* Indentation is using tabs, not spaces. Most of the code is indented with 2 spaces, some with 4 spaced tabs. Please try to stick to tabs.
   If you're using an editor that supports `EditorConfig <http://EditorConfig.org>`_\ , the editor should automatically use the settings defined in Bash-it's `.editorconfig file <.editorconfig>`_.
 * When creating new functions, please use a dash ("-") to separate the words of the function's name, e.g. ``my-new-function``.
   Don't use underscores, e.g. ``my_new_function``.

From 0e904abd0db5270e783cba7ff9811862c240660c Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 6 Dec 2020 23:08:42 +0200
Subject: [PATCH 376/388] github: Add no-response bot

---
 .github/no-response.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/no-response.yml

diff --git a/.github/no-response.yml b/.github/no-response.yml
new file mode 100644
index 00000000..e80a98be
--- /dev/null
+++ b/.github/no-response.yml
@@ -0,0 +1,11 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+# Label requiring a response
+responseRequiredLabel: waiting-for-response
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author.
+  You can always reopen the issue if needed.

From 5a85126241056046359e6025352ade717a9d8d67 Mon Sep 17 00:00:00 2001
From: Ira Abramov <github@ira.abramov.org>
Date: Mon, 7 Dec 2020 18:06:27 +0200
Subject: [PATCH 377/388] complete cleanup of the knife completion file

---
 clean_files.txt                            |  1 +
 completion/available/knife.completion.bash | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index 47ae7e93..8c4e5926 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -31,5 +31,6 @@ themes/powerline
 # completions
 #
 completion/available/cargo.completion.bash
+completion/available/knife.completion.bash
 completion/available/pipx.completion.bash
 completion/available/rustup.completion.bash
diff --git a/completion/available/knife.completion.bash b/completion/available/knife.completion.bash
index 8c6fef9b..cf050e36 100644
--- a/completion/available/knife.completion.bash
+++ b/completion/available/knife.completion.bash
@@ -44,20 +44,22 @@ _KAC_regen_cache() {
 	local CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
 	local TMP_FILE=$(mktemp "$_KAC_CACHE_TMP_DIR/$CACHE_NAME.XXXX")
 	shift 1
-	"$@" > "$TMP_FILE" 2> /dev/null
 	# discard the temp file if it's empty AND the previous command didn't exit successfully, but still mark the cache as updated
-	[[ $? != 0 ]] && [[ $(wc -l "$TMP_FILE") == 0 ]] && rm -f "$TMP_FILE" && touch "$CACHE_PATH" && return 1 \
-		|| mv -f "$TMP_FILE" "$CACHE_PATH"
+	if ! "$@" > "$TMP_FILE" 2> /dev/null; then
+		[[ $(wc -l "$TMP_FILE") == 0 ]] && rm -f "$TMP_FILE" && touch "$CACHE_PATH" && return 1
+	else
+		mv -f "$TMP_FILE" "$CACHE_PATH"
+	fi
 }
 
 # cached files can't have spaces in their names
 _KAC_get_cache_name_from_command() {
-	echo "$@" | sed 's/ /_SPACE_/g'
+	echo "${@/ /_SPACE_}"
 }
 
 # the reverse operation from the function above
 _KAC_get_command_from_cache_name() {
-	echo "$@" | sed 's/_SPACE_/ /g'
+	echo "${@/_SPACE_/ }"
 }
 
 # given a command as argument, it fetches the cache for that command if it can find it
@@ -82,7 +84,7 @@ _KAC_get_and_regen_cache() {
 _KAC_clean_cache() {
 	local FILE CMD
 	# delete all obsolete temp files, could be lingering there for any kind of crash in the caching process
-	for FILE in $(\ls "$_KAC_CACHE_TMP_DIR"); do
+	for FILE in "$_KAC_CACHE_TMP_DIR"/*; do
 		_KAC_is_file_newer_than "$FILE" "$_KNIFE_AUTOCOMPLETE_MAX_CACHE_AGE" || rm -f "$FILE"
 	done
 	# refresh really stale caches
@@ -192,8 +194,8 @@ _knife() {
 		_KAC_get_and_regen_cache "$REGEN_CMD"
 		LIST="$LIST $(cat "$_KAC_CACHE_PATH")"
 	done
+	# shellcheck disable=SC2207,SC2086
 	COMPREPLY=($(compgen -W "${LIST}" -- ${COMP_WORDS[COMP_CWORD]}))
 }
 
-#complete -f -F _knife knife
 complete -F _knife knife

From 0e6f10f48930c4417f21a680d15e6eaddf102e31 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 7 Dec 2020 21:38:35 +0200
Subject: [PATCH 378/388] docs: Add github action CI badge

---
 docs/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 8867f05a..f8e94995 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,5 @@
 # Bash-it
-
-[![Build Status](https://travis-ci.com/Bash-it/bash-it.svg?branch=master)](https://travis-ci.com/Bash-it/bash-it)
+![Build Status](https://github.com/Bash-it/bash-it/workflows/CI/badge.svg?branch=master)
 [![Join the chat at https://gitter.im/Bash-it/bash-it](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Bash-it/bash-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 **Bash-it** is a collection of community Bash commands and scripts for Bash 3.2+.

From 3019dc331d840ea2b275f87342d8520397b22000 Mon Sep 17 00:00:00 2001
From: egvimo <egvimo@users.noreply.github.com>
Date: Fri, 11 Dec 2020 15:32:23 +0100
Subject: [PATCH 379/388] Add option to append template to existing config
 (#1723)

* Add option to append template to existing config

* Add test for append-to-config option

Co-authored-by: Egor Moor <egor.moor@edag-ps.com>
---
 docs/installation.rst     |  1 +
 install.sh                | 38 ++++++++++++++++++++++++++++----------
 test/install/install.bats | 25 +++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index 12cc9437..9688af20 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -19,6 +19,7 @@ The install script can take the following options:
 * ``--interactive``\ : Asks the user which aliases, completions and plugins to enable.
 * ``--silent``\ : Ask nothing and install using default settings.
 * ``--no-modify-config``\ : Do not modify the existing config file (\ ``~/.bash_profile`` or ``~/.bashrc``\ ).
+* ``--append-to-config``\ : Back up existing config file and append bash-it templates at the end.
 
 When run without the ``--interactive`` switch, Bash-it only enables a sane default set of functionality to keep your shell clean and to avoid issues with missing dependencies.
 Feel free to enable the tools you want to use after the installation.
diff --git a/install.sh b/install.sh
index 8250c3df..b9ea5c68 100755
--- a/install.sh
+++ b/install.sh
@@ -10,6 +10,7 @@ function show_usage() {
   echo "--silent (-s): Install default settings without prompting for input";
   echo "--interactive (-i): Interactively choose plugins"
   echo "--no-modify-config (-n): Do not modify existing config file"
+  echo "--append-to-config (-a): Keep existing config file and append bash-it templates at the end"
   exit 0;
 }
 
@@ -56,15 +57,27 @@ function load_some() {
   done
 }
 
-# Back up existing profile and create new one for bash-it
-function backup_new() {
+# Back up existing profile
+function backup() {
   test -w "$HOME/$CONFIG_FILE" &&
   cp -aL "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.bak" &&
   echo -e "\033[0;32mYour original $CONFIG_FILE has been backed up to $CONFIG_FILE.bak\033[0m"
+}
+
+# Back up existing profile and create new one for bash-it
+function backup_new() {
+  backup
   sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" > "$HOME/$CONFIG_FILE"
   echo -e "\033[0;32mCopied the template $CONFIG_FILE into ~/$CONFIG_FILE, edit this file to customize bash-it\033[0m"
 }
 
+# Back up existing profile and append bash-it templates at the end
+function backup_append() {
+	backup
+	(sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" | tail -n +2) >> "$HOME/$CONFIG_FILE"
+	echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m"
+}
+
 for param in "$@"; do
   shift
   case "$param" in
@@ -72,18 +85,20 @@ for param in "$@"; do
     "--silent")             set -- "$@" "-s" ;;
     "--interactive")        set -- "$@" "-i" ;;
     "--no-modify-config")   set -- "$@" "-n" ;;
+    "--append-to-config")   set -- "$@" "-a" ;;
     *)                      set -- "$@" "$param"
   esac
 done
 
 OPTIND=1
-while getopts "hsin" opt
+while getopts "hsina" opt
 do
   case "$opt" in
   "h") show_usage; exit 0 ;;
   "s") silent=true ;;
   "i") interactive=true ;;
   "n") no_modify_config=true ;;
+  "a") append_to_config=true ;;
   "?") show_usage >&2; exit 1 ;;
   esac
 done
@@ -94,6 +109,11 @@ if [[ $silent ]] && [[ $interactive ]]; then
   exit 1;
 fi
 
+if [[ $no_modify_config ]] && [[ $append_to_config ]]; then
+  echo -e "\033[91mOptions --no-modify-config and --append-to-config are mutually exclusive. Please choose one or the other.\033[m"
+  exit 1;
+fi
+
 BASH_IT="$(cd "$(dirname "$0")" && pwd)"
 
 case $OSTYPE in
@@ -127,16 +147,11 @@ if ! [[ $silent ]] && ! [[ $no_modify_config ]]; then
     done
   fi
 
-  while ! [ $silent ]; do
+  while ! [ $append_to_config ]; do
     read -e -n 1 -r -p "Would you like to keep your $CONFIG_FILE and append bash-it templates at the end? [y/N] " choice
     case $choice in
     [yY])
-      test -w "$HOME/$CONFIG_FILE" &&
-      cp -aL "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.bak" &&
-      echo -e "\033[0;32mYour original $CONFIG_FILE has been backed up to $CONFIG_FILE.bak\033[0m"
-
-      (sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" | tail -n +2) >> "$HOME/$CONFIG_FILE"
-      echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m"
+      backup_append
       break
       ;;
     [nN]|"")
@@ -148,6 +163,9 @@ if ! [[ $silent ]] && ! [[ $no_modify_config ]]; then
       ;;
     esac
   done
+elif [[ $append_to_config ]]; then
+  # backup/append
+  backup_append
 elif [[ $silent ]] && ! [[ $no_modify_config ]]; then
   # backup/new by default
   backup_new
diff --git a/test/install/install.bats b/test/install/install.bats
index 01776f25..7b4b5347 100644
--- a/test/install/install.bats
+++ b/test/install/install.bats
@@ -59,3 +59,28 @@ function local_setup {
 
   assert_failure
 }
+
+@test "install: verify that no-modify-config and append-to-config can not be used at the same time" {
+  cd "$BASH_IT"
+
+  run ./install.sh --silent --no-modify-config --append-to-config
+
+  assert_failure
+}
+
+@test "install: verify that the template is appended" {
+  cd "$BASH_IT"
+
+  touch "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
+  echo "test file content" > "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
+
+  ./install.sh --silent --append-to-config
+
+  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE"
+  assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak"
+
+  run cat $BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE
+
+  assert_line "test file content"
+  assert_line "source \"\$BASH_IT\"/bash_it.sh"
+}

From 4dfd8bcc42e4180e5c87b9347f929ee670af6929 Mon Sep 17 00:00:00 2001
From: Ron Green <11993626+georgettica@users.noreply.github.com>
Date: Sun, 13 Dec 2020 22:58:01 +0200
Subject: [PATCH 380/388] feat(git-aliases): add checkout with username (fixes
 #1712) (#1732)

* feat(git-aliases): add checkout with username

this can be useful for creating a branch with a common prefix

* fix(git-alais): change quotes
---
 aliases/available/git.aliases.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 0803dee2..a46b44fa 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -65,6 +65,7 @@ alias gco='git checkout'
 alias gcom='git checkout master'
 alias gcb='git checkout -b'
 alias gcob='git checkout -b'
+alias gcobu='git checkout -b ${USER}/'
 alias gct='git checkout --track'
 alias gcpd='git checkout master; git pull; git branch -D'
 alias gexport='git archive --format zip --output'

From 7b21a76c6af879618a4303884c2b4e21a60dec9c Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 13 Dec 2020 23:15:05 +0200
Subject: [PATCH 381/388] docs: themes-list: Use gh-pages instead of wiki

Also note that its only most of the themes, not all of them
---
 docs/themes-list/index.rst | 262 ++++++++++++++++++-------------------
 1 file changed, 131 insertions(+), 131 deletions(-)

diff --git a/docs/themes-list/index.rst b/docs/themes-list/index.rst
index 0df4c087..e15cd313 100644
--- a/docs/themes-list/index.rst
+++ b/docs/themes-list/index.rst
@@ -3,7 +3,7 @@
 List of Themes
 ==============
 
-Below is a list of all of the themes (with screenshots) that `bash-it <https://github.com/Bash-it/bash-it/>`_ ships with.
+Below is a list of most of the themes (with screenshots) that `bash-it <https://github.com/Bash-it/bash-it/>`_ ships with.
 
 Alphabetical List:
 ------------------
@@ -12,13 +12,13 @@ Bakke
 ^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/bakke-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bakke-black.jpg
    :alt: Bakke
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bakke-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/bakke-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bakke-white.jpg
    :alt: Bakke
 
 
@@ -28,13 +28,13 @@ BarbUk
 ^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-black.png
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-black.png
+.. image:: https://bash-it.github.io/bash-it/docs/images/BarbUk-black.png
+   :target: https://bash-it.github.io/bash-it/docs/images/BarbUk-black.png
    :alt: BarbUk
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-white.png
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/BarbUk-white.png
+.. image:: https://bash-it.github.io/bash-it/docs/images/BarbUk-white.png
+   :target: https://bash-it.github.io/bash-it/docs/images/BarbUk-white.png
    :alt: BarbUk
 
 
@@ -44,13 +44,13 @@ Bobby
 ^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/bobby-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bobby-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/bobby-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/bobby-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bobby-white.jpg
    :alt:
 
 
@@ -60,8 +60,8 @@ Brunton
 ^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/brunton-black.png
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/brunton-black.png
+.. image:: https://bash-it.github.io/bash-it/docs/images/brunton-black.png
+   :target: https://bash-it.github.io/bash-it/docs/images/brunton-black.png
    :alt:
 
 
@@ -71,13 +71,13 @@ Candy
 ^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/candy-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/candy-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/candy-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/candy-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/candy-white.jpg
    :alt:
 
 
@@ -87,13 +87,13 @@ Clean
 ^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/clean-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/clean-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/clean-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/clean-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/clean-white.jpg
    :alt:
 
 
@@ -103,13 +103,13 @@ Demula
 ^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/demula-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/demula-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/demula-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/demula-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/demula-white.jpg
    :alt:
 
 
@@ -119,13 +119,13 @@ DOS
 ^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/dos-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/dos-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/dos-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/dos-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/dos-white.jpg
    :alt:
 
 
@@ -135,13 +135,13 @@ DoubleTime
 ^^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime-white.jpg
    :alt:
 
 
@@ -151,13 +151,13 @@ DoubleTime Multiline
 ^^^^^^^^^^^^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-white.jpg
    :alt:
 
 
@@ -167,13 +167,13 @@ Doubletime Multiline Python Only
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/doubletime_multiline_pyonly-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-white.jpg
    :alt:
 
 
@@ -183,13 +183,13 @@ Envy
 ^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/envy-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/envy-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/envy-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/envy-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/envy-white.jpg
    :alt:
 
 
@@ -217,13 +217,13 @@ Mr Briggs
 ^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/mbriggs-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/mbriggs-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/mbriggs-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/mbriggs-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/mbriggs-white.jpg
    :alt:
 
 
@@ -233,13 +233,13 @@ Minimal
 ^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/minimal-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/minimal-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/minimal-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/minimal-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/minimal-white.jpg
    :alt:
 
 
@@ -249,13 +249,13 @@ Modern
 ^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-white.jpg
    :alt:
 
 
@@ -265,13 +265,13 @@ Modern T
 ^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-t-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-t-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/modern-t-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-t-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-t-white.jpg
    :alt:
 
 
@@ -292,13 +292,13 @@ n0Qorg
 ^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/n0qorg-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/n0qorg-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/n0qorg-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/n0qorg-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/n0qorg-white.jpg
    :alt:
 
 
@@ -308,13 +308,13 @@ NWinkler
 ^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/nwinkler-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/nwinkler-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/nwinkler-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/nwinkler-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/nwinkler-white.jpg
    :alt:
 
 
@@ -324,13 +324,13 @@ Pete
 ^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/pete-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pete-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pete-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/pete-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pete-white.jpg
    :alt:
 
 
@@ -340,13 +340,13 @@ Powerline
 ^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-white.jpg
    :alt:
 
 
@@ -356,13 +356,13 @@ Powerline Naked
 ^^^^^^^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-naked-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-naked-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-naked-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-naked-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-naked-white.jpg
    :alt:
 
 
@@ -372,13 +372,13 @@ Powerline Plain
 ^^^^^^^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-plain-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-plain-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/powerline-plain-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-plain-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-plain-white.jpg
    :alt:
 
 
@@ -388,13 +388,13 @@ Pure
 ^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/pure-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pure-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/pure-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/pure-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pure-white.jpg
    :alt:
 
 
@@ -404,13 +404,13 @@ RainbowBrite
 ^^^^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rainbowbrite-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-white.jpg
    :alt:
 
 
@@ -420,13 +420,13 @@ R Jorgenson
 ^^^^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/rjorgenson-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rjorgenson-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/rjorgenson-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/rjorgenson-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rjorgenson-white.jpg
    :alt:
 
 
@@ -436,13 +436,13 @@ Sexy
 ^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/sexy-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sexy-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sexy-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/sexy-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sexy-white.jpg
    :alt:
 
 
@@ -452,13 +452,13 @@ Simple
 ^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/simple-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/simple-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/simple-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/simple-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/simple-white.jpg
    :alt:
 
 
@@ -468,13 +468,13 @@ SirUp
 ^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/sirup-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sirup-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/sirup-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/sirup-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sirup-white.jpg
    :alt:
 
 
@@ -484,13 +484,13 @@ Standard
 ^^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/standard-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/standard-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/standard-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/standard-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/standard-white.jpg
    :alt:
 
 
@@ -500,13 +500,13 @@ Tonka
 ^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/tonka-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tonka-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tonka-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/tonka-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tonka-white.jpg
    :alt:
 
 
@@ -516,13 +516,13 @@ Tylenol
 ^^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/tylenol-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tylenol-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/tylenol-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/tylenol-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tylenol-white.jpg
    :alt:
 
 
@@ -532,13 +532,13 @@ Zitron
 ^^^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/zitron-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zitron-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zitron-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/zitron-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zitron-white.jpg
    :alt:
 
 
@@ -548,11 +548,11 @@ Zork
 ^^^^
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-black.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-black.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/zork-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zork-black.jpg
    :alt:
 
 
-.. image:: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-white.jpg
-   :target: https://raw.github.com/wiki/revans/bash-it/images/screenshots/zork-white.jpg
+.. image:: https://bash-it.github.io/bash-it/docs/images/zork-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zork-white.jpg
    :alt:

From bced06994b227cff5ad6a3d1c7002943da7913f8 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 30 Oct 2020 19:06:05 +0200
Subject: [PATCH 382/388] Move theme documentation to be under docs/themes-list

---
 docs/themes-list/atomic.rst                   | 200 ++++++++++++++++++
 docs/themes-list/barbuk.rst                   | 124 +++++++++++
 docs/themes-list/bira.rst                     |  12 ++
 docs/themes-list/brainy.rst                   | 145 +++++++++++++
 docs/themes-list/codeword.rst                 |  28 +++
 docs/themes-list/index.rst                    |  18 +-
 .../themes-list/nwinkler_random_colors.png    | Bin
 docs/themes-list/nwinkler_random_colors.rst   |  39 ++++
 docs/themes-list/powerline-multiline.rst      | 144 +++++++++++++
 docs/themes-list/powerline-naked.rst          | 121 +++++++++++
 docs/themes-list/powerline-plain.rst          | 121 +++++++++++
 docs/themes-list/powerline.rst                | 128 +++++++++++
 docs/themes-list/radek.rst                    |  25 +++
 .../themes-list/redline.png                   | Bin
 docs/themes-list/redline.rst                  |  56 +++++
 15 files changed, 1158 insertions(+), 3 deletions(-)
 create mode 100644 docs/themes-list/atomic.rst
 create mode 100644 docs/themes-list/barbuk.rst
 create mode 100644 docs/themes-list/bira.rst
 create mode 100644 docs/themes-list/brainy.rst
 create mode 100644 docs/themes-list/codeword.rst
 rename themes/nwinkler_random_colors/screenshot.png => docs/themes-list/nwinkler_random_colors.png (100%)
 create mode 100644 docs/themes-list/nwinkler_random_colors.rst
 create mode 100644 docs/themes-list/powerline-multiline.rst
 create mode 100644 docs/themes-list/powerline-naked.rst
 create mode 100644 docs/themes-list/powerline-plain.rst
 create mode 100644 docs/themes-list/powerline.rst
 create mode 100644 docs/themes-list/radek.rst
 rename themes/redline/screenshot.png => docs/themes-list/redline.png (100%)
 create mode 100644 docs/themes-list/redline.rst

diff --git a/docs/themes-list/atomic.rst b/docs/themes-list/atomic.rst
new file mode 100644
index 00000000..7d471ba9
--- /dev/null
+++ b/docs/themes-list/atomic.rst
@@ -0,0 +1,200 @@
+.. _atomic:
+
+Atomic theme
+============
+
+The Best ColorFull terminal prompt theme inspired by a number of themes and based on the theme of @MunifTanjim :ref:`brainy <brainy>`.
+
+Supported on all operating systems.
+
+In constant maintenance and improvement
+
+
+.. image:: https://raw.githubusercontent.com/lfelipe1501/lfelipe-projects/master/AtomicTheme.gif
+   :target: https://raw.githubusercontent.com/lfelipe1501/lfelipe-projects/master/AtomicTheme.gif
+   :alt: Atomic-Theme
+
+
+Install Theme
+-------------
+
+Manually
+^^^^^^^^
+
+You can install the theme manually by following these steps:
+Edit your modified config ``~/.bashrc`` file in order to customize Bash-it, set ``BASH_IT_THEME`` to the theme name ``atomic``.
+
+Examples:
+
+.. code-block:: bash
+
+   # Use the "atomic" theme
+   export BASH_IT_THEME="atomic"
+
+Automatically via terminal
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+#. You can install the theme automatically using the ``sed`` command from your Linux or OSX Terminal.
+#. On macOS, the ~/.bash_profile is used, not the ~/.bashrc.
+#. For installation on windows you should use `\ ``Git-Bash`` <https://git-for-windows.github.io/>`_ or make sure the terminal emulator you use (ej: cygwin, mintty, etc) has the ``sed`` command installed.
+
+Command to execute For Windows and Linux:
+
+.. code-block:: bash
+
+   # Set the "atomic" theme replacing the theme you are using of bash-it
+   sed -i 's/'"$BASH_IT_THEME"'/atomic/g' ~/.bashrc
+
+Command to execute for macOS:
+
+.. code-block:: bash
+
+   # Set the "atomic" theme replacing the theme you are using of bash-it
+   sed -i '' 's/'"$BASH_IT_THEME"'/atomic/g' ~/.bash_profile
+
+Features
+--------
+
+Prompt Segments
+^^^^^^^^^^^^^^^
+
+
+* Username & Hostname
+* Current Directory
+* SCM Information
+* Battery Charge
+* Clock
+* `Todo.txt <https://github.com/ginatrapani/todo.txt-cli>`_ status
+* Ruby Environment
+* Python Environment
+* Exit Code
+
+Others
+^^^^^^
+
+
+* Indicator for cached ``sudo`` credential
+* Indicator for abort (ctrl + C) the current task and regain user control
+* ``atomic`` command for showing/hiding various prompt segments on-the-fly
+
+Configuration
+-------------
+
+Various prompt segments can be shown/hidden or modified according to your choice. There are two ways for doing that:
+
+
+#. On-the-fly using ``atomic`` command
+#. Theme Environment Variables
+
+On-the-fly using ``atomic`` command
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This theme provides a command for showing/hiding prompt segments.
+
+``atomic show <segment>``
+
+``atomic hide <segment>``
+
+Tab-completion for this command is enabled by default.
+
+Configuration specified by this command will only be applied to current and subsequent child shells.
+
+Theme Environment Variables
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This is used for permanent settings that apply to all terminal sessions. You have to define the value of specific theme variables in your ``bashrc`` (or equivalent) file.
+
+The name of the variables are listed below along with their default values.
+
+User Information
+~~~~~~~~~~~~~~~~
+
+Indicator for cached ``sudo`` credential (see ``sudo`` manpage for more information):
+
+``THEME_SHOW_SUDO=true``
+
+SCM Information
+~~~~~~~~~~~~~~~
+
+Information about SCM repository status:
+
+``THEME_SHOW_SCM=true``
+
+Ruby Environment
+~~~~~~~~~~~~~~~~
+
+Ruby environment version information:
+
+``THEME_SHOW_RUBY=false``
+
+Python Environment
+~~~~~~~~~~~~~~~~~~
+
+Python environment version information:
+
+``THEME_SHOW_PYTHON=false``
+
+ToDo.txt status
+~~~~~~~~~~~~~~~
+
+`Todo.txt <https://github.com/ginatrapani/todo.txt-cli>`_ status:
+
+``THEME_SHOW_TODO=false``
+
+Clock
+~~~~~
+
+``THEME_SHOW_CLOCK=true``
+
+``THEME_CLOCK_COLOR=$bold_cyan``
+
+Format of the clock (see ``date`` manpage for more information):
+
+``THEME_CLOCK_FORMAT="%H:%M:%S"``
+
+Battery Charge
+~~~~~~~~~~~~~~
+
+Battery charge percentage:
+
+``THEME_SHOW_BATTERY=false``
+
+Exit Code
+~~~~~~~~~
+
+Exit code of the last command:
+
+``THEME_SHOW_EXITCODE=true``
+
+Prompt Segments Order
+---------------------
+
+Currently available prompt segments are:
+
+
+* battery
+* char
+* clock
+* dir
+* exitcode
+* python
+* ruby
+* scm
+* todo
+* user_info
+
+Three environment variables can be defined to rearrange the segments order. The default values are:
+
+``___ATOMIC_TOP_LEFT="user_info dir scm"``
+
+``___ATOMIC_TOP_RIGHT="exitcode python ruby todo clock battery"``
+
+``___ATOMIC_BOTTOM="char"``
+
+Development by
+^^^^^^^^^^^^^^
+
+Developer / Author: `Luis Felipe Sánchez <https://github.com/lfelipe1501>`_
+
+This work is licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
diff --git a/docs/themes-list/barbuk.rst b/docs/themes-list/barbuk.rst
new file mode 100644
index 00000000..5fe49048
--- /dev/null
+++ b/docs/themes-list/barbuk.rst
@@ -0,0 +1,124 @@
+.. _barbuk:
+
+BarbUk theme
+============
+
+A minimal theme with a clean git prompt
+
+Provided Information
+--------------------
+
+
+* Current git remote tool logo (support: github, gitlab, bitbucket)
+* Current path (red when user is root)
+* Current git info
+* Last command exit code (only shown when the exit code is greater than 0)
+* user@hostname for ssh connection
+
+Fonts and glyphs
+----------------
+
+A font with SCM glyphs is required to display the default tool/host logos.
+You can use a font from https://www.nerdfonts.com/ or patch your own font with the tool
+provided by https://github.com/ryanoasis/nerd-fonts.
+
+You can also override the default variables if you want to use different glyphs or standard ASCII characters.
+
+Default theme glyphs
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+   BARBUK_GITLAB_CHAR='  '
+   BARBUK_BITBUCKET_CHAR='  '
+   BARBUK_GITHUB_CHAR='  '
+   BARBUK_GIT_DEFAULT_CHAR='  '
+   BARBUK_GIT_BRANCH_ICON=''
+   BARBUK_HG_CHAR='☿ '
+   BARBUK_SVN_CHAR='⑆ '
+   BARBUK_EXIT_CODE_ICON=' '
+   BARBUK_PYTHON_VENV_CHAR=' '
+
+Customize glyphs
+^^^^^^^^^^^^^^^^
+
+Define your custom glyphs before sourcing bash-it:
+
+.. code-block:: bash
+
+   export BARBUK_GITHUB_CHAR='•'
+   source "$BASH_IT"/bash_it.sh
+
+SSH prompt
+----------
+
+Usage
+^^^^^
+
+When using a ssh session, the theme will display ``user@hostname``.
+You can disable this information with ``BARBUK_SSH_INFO``.
+
+The hostname is displayed in the FQDN format by default. You
+can use the short hostname format with ``BARBUK_HOST_INFO``.
+
+.. code-block:: bash
+
+   # short or long
+   export BARBUK_HOST_INFO=short
+   # true or false
+   export BARBUK_SSH_INFO=false
+   source "$BASH_IT"/bash_it.sh
+
+Keep theme with sudoer
+^^^^^^^^^^^^^^^^^^^^^^
+
+If you want the theme to persist using ``sudo -s`` in a ssh session, you need to configure sudo to keep the ``HOME`` and ``SSH_CONNECTION`` environment variables.
+
+``HOME`` contains the path to the home directory of the current user. Keeping it will allow to use your user dotfiles when elevating privileges.
+
+Keeping ``SSH_CONNECTION`` env is necessary for ssh detection in the theme.
+
+Please refer to the following documentation for more information:
+
+
+* `sudo manual <https://www.sudo.ws/man/1.8.13/sudoers.man.html>`_ for ``env_keep`` configuration
+* `openssh manual <https://linux.die.net/man/1/ssh>`_ for information about ``SSH_CONNECTION`` environment
+
+.. code-block:: bash
+
+   cat << EOF > /etc/sudoers.d/keepenv
+   Defaults env_keep += HOME
+   Defaults env_keep += SSH_CONNECTION
+   EOF
+   chmod 400 /etc/sudoers.d/keepenv
+
+Examples
+--------
+
+Clean
+^^^^^
+
+.. code-block:: bash
+
+    ~ ❯
+
+Git
+^^^
+
+.. code-block:: bash
+
+      ~/.dotfiles on  master ⤏  origin ↑2 •7 ✗ ❯
+
+Ssh
+^^^
+
+.. code-block:: bash
+
+   user@hostname in  ~/bash-it on  master ✓ ❯
+
+Python venv
+^^^^^^^^^^^
+
+.. code-block:: bash
+
+     flask ~/test on  master ✓ ❯
diff --git a/docs/themes-list/bira.rst b/docs/themes-list/bira.rst
new file mode 100644
index 00000000..ee69f712
--- /dev/null
+++ b/docs/themes-list/bira.rst
@@ -0,0 +1,12 @@
+.. _bira:
+
+Bira Theme
+==========
+
+This is a port of Oh My Zsh's `'Bira' <https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/bira.zsh-theme>`_ theme. It looks the same as the original, except for the following changes:
+
+
+* Exit code of last command is not shown
+* More informative git prompt (if you want to keep it minimal, please read: :ref:`git_prompt`)
+* Position and colour of virtualenv prompt
+* No ruby version prompt
diff --git a/docs/themes-list/brainy.rst b/docs/themes-list/brainy.rst
new file mode 100644
index 00000000..04e1652a
--- /dev/null
+++ b/docs/themes-list/brainy.rst
@@ -0,0 +1,145 @@
+.. _brainy:
+
+Brainy theme
+============
+
+Simple colorful terminal prompt theme (inspired by a number of themes).
+
+Features
+--------
+
+Prompt Segments
+^^^^^^^^^^^^^^^
+
+
+* Username & Hostname
+* Current Directory
+* SCM Information
+* Battery Charge
+* Clock
+* `Todo.txt <https://github.com/ginatrapani/todo.txt-cli>`_ status
+* Ruby Environment
+* Python Environment
+* Exit Code
+
+Others
+^^^^^^
+
+
+* Indicator for cached ``sudo`` credential
+* Indicator for ssh login
+* ``brainy`` command for showing/hiding various prompt segments on-the-fly
+
+Configuration
+-------------
+
+Various prompt segments can be shown/hidden or modified according to your choice. There are two ways for doing that:
+
+
+#. On-the-fly using ``brainy`` command
+#. Theme Environment Variables
+
+On-the-fly using ``brainy`` command
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This theme provides a command for showing/hiding prompt segments.
+
+``brainy show <segment>``
+
+``brainy hide <segment>``
+
+Tab-completion for this command is enabled by default.
+
+Configuration specified by this command will only be applied to current and subsequent child shells.
+
+Theme Environment Variables
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This is used for permanent settings that apply to all terminal sessions. You have to define the value of specific theme variables in your ``bashrc`` (or equivalent) file.
+
+The name of the variables are listed below along with their default values.
+
+User Information
+~~~~~~~~~~~~~~~~
+
+Indicator for cached ``sudo`` credential (see ``sudo`` manpage for more information):
+
+``THEME_SHOW_SUDO=true``
+
+SCM Information
+~~~~~~~~~~~~~~~
+
+Information about SCM repository status:
+
+``THEME_SHOW_SCM=true``
+
+Ruby Environment
+~~~~~~~~~~~~~~~~
+
+Ruby environment version information:
+
+``THEME_SHOW_RUBY=false``
+
+Python Environment
+~~~~~~~~~~~~~~~~~~
+
+Python environment version information:
+
+``THEME_SHOW_PYTHON=false``
+
+ToDo.txt status
+~~~~~~~~~~~~~~~
+
+`Todo.txt <https://github.com/ginatrapani/todo.txt-cli>`_ status:
+
+``THEME_SHOW_TODO=false``
+
+Clock
+~~~~~
+
+``THEME_SHOW_CLOCK=true``
+
+``THEME_CLOCK_COLOR=$bold_cyan``
+
+Format of the clock (see ``date`` manpage for more information):
+
+``THEME_CLOCK_FORMAT="%H:%M:%S"``
+
+Battery Charge
+~~~~~~~~~~~~~~
+
+Battery charge percentage:
+
+``THEME_SHOW_BATTERY=false``
+
+Exit Code
+~~~~~~~~~
+
+Exit code of the last command:
+
+``THEME_SHOW_EXITCODE=true``
+
+Prompt Segments Order
+---------------------
+
+Currently available prompt segments are:
+
+
+* battery
+* char
+* clock
+* dir
+* exitcode
+* python
+* ruby
+* scm
+* todo
+* user_info
+
+Three environment variables can be defined to rearrange the segments order. The default values are:
+
+``___BRAINY_TOP_LEFT="user_info dir scm"``
+
+``___BRAINY_TOP_RIGHT="python ruby todo clock battery"``
+
+``___BRAINY_BOTTOM="exitcode char"``
diff --git a/docs/themes-list/codeword.rst b/docs/themes-list/codeword.rst
new file mode 100644
index 00000000..00bb7ee4
--- /dev/null
+++ b/docs/themes-list/codeword.rst
@@ -0,0 +1,28 @@
+.. _codeword:
+
+Codeword Theme
+==============
+
+Single line PS1 theme w/realtime history among windows.
+Minimal theme overrides from bash_it base theming
+
+``user@host:path[virt-env][scm] $``
+---------------------------------------
+
+Breakdown of the segments:
+
+
+* **user@host:path** - *convienient for LAN based ``ssh`` and ``scp`` tasks*
+* [\ **virtualenv**\ ] - *only appears when activated*
+* [\ **scm**\ ] - *only appears when activated*
+* **marker** - *$ or # depending on current user*
+
+Examples
+^^^^^^^^
+
+.. code-block:: bash
+
+   user@example.lan:~ $ cd /tmp/foo/bar/baz
+   user@example.lan:/tmp/foo/bar/baz $ cd $HOME/workspace
+   user@example.lan:~/workspace $ cd sampleRepo/
+   user@example.lan:~/workspace/sampleRepo [± |master ↑1 ↓3 {1} S:2 ?:1 ✗|] $
diff --git a/docs/themes-list/index.rst b/docs/themes-list/index.rst
index e15cd313..6e912446 100644
--- a/docs/themes-list/index.rst
+++ b/docs/themes-list/index.rst
@@ -3,10 +3,20 @@
 List of Themes
 ==============
 
-Below is a list of most of the themes (with screenshots) that `bash-it <https://github.com/Bash-it/bash-it/>`_ ships with.
+Below is a list of most of the themes (with screenshots) and their documentation that `bash-it <https://github.com/Bash-it/bash-it/>`_ ships with.
 
-Alphabetical List:
-------------------
+.. note::
+  Not all themes have documentation!
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Documentation of Themes
+   :glob:
+
+   *
+
+Alphabetical Screenshots List
+-----------------------------
 
 Bakke
 ^^^^^
@@ -304,6 +314,8 @@ n0Qorg
 
 ----
 
+.. _nwinkler_image:
+
 NWinkler
 ^^^^^^^^
 
diff --git a/themes/nwinkler_random_colors/screenshot.png b/docs/themes-list/nwinkler_random_colors.png
similarity index 100%
rename from themes/nwinkler_random_colors/screenshot.png
rename to docs/themes-list/nwinkler_random_colors.png
diff --git a/docs/themes-list/nwinkler_random_colors.rst b/docs/themes-list/nwinkler_random_colors.rst
new file mode 100644
index 00000000..20ea34c3
--- /dev/null
+++ b/docs/themes-list/nwinkler_random_colors.rst
@@ -0,0 +1,39 @@
+.. _nwinkler_random_color:
+
+Nwinkler Random Color Theme
+===========================
+
+Description
+-----------
+
+The *Nwinkler Random Color* Theme is based on the :ref:`Nwinkler Theme <nwinkler_image>` , but it randomizes the colors for:
+
+
+* time
+* username
+* hostname
+* path
+
+The random colors are chosen the first time this theme is used and saved to the ``~/.nwinkler_random_colors`` file. So, the next time you connect to the same machine, you will get the same colors.
+
+To force new random colors to be selected, run the command:
+
+.. code-block:: sh
+
+   randomize_nwinkler
+
+Screenshot
+----------
+
+Here it is in action:
+
+
+.. image:: nwinkler_random_colors.png
+   :target: nwinkler_random_colors.png
+   :alt: alt text
+
+
+Usage Scenario
+--------------
+
+This theme is especially useful when connecting to many different machines and switching between them often. Yes, the hostname *is* present in the prompt. But I argue that it's a lot faster to get a "feel" of what machine you are currently on because of the custom colors on that machine's prompt than by reading the hostname.
diff --git a/docs/themes-list/powerline-multiline.rst b/docs/themes-list/powerline-multiline.rst
new file mode 100644
index 00000000..41cf0cf6
--- /dev/null
+++ b/docs/themes-list/powerline-multiline.rst
@@ -0,0 +1,144 @@
+.. _powerline_multiline:
+
+Powerline Multiline Theme
+=========================
+
+A colorful multiline theme, where the first line shows information about your shell session (divided into two parts, left and right), and the second one is where the shell commands are introduced.
+
+**IMPORTANT:** This theme requires that `a font with the Powerline symbols <https://github.com/powerline/fonts>`_ needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
+
+Provided Information
+--------------------
+
+
+* Current path
+* Current username and hostname
+* Current time
+* Current shell level
+* Current dirstack level (\ ``pushd`` / ``popd``\ )
+* Current history number
+* Current command number
+* An indicator when connected by SSH
+* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
+* An indicator when the current shell is inside the Vim editor
+* Battery charging status (depends on the battery plugin)
+* SCM Repository status (e.g. Git, SVN)
+* The current Python environment (Virtualenv, venv, and Conda are supported) in use
+* The current Ruby environment (rvm and rbenv are supported) in use
+* Last command exit code (only shown when the exit code is greater than 0)
+
+Configuration
+-------------
+
+This theme is pretty configurable, all the configuration is done by setting environment variables.
+
+User Information
+^^^^^^^^^^^^^^^^
+
+By default, the username and hostname are shown on the right hand side, but you can change this behavior by setting the value of the following variable:
+
+.. code-block:: bash
+
+   export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
+
+For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
+
+Clock Format
+^^^^^^^^^^^^
+
+By default, the current time is shown on the right hand side, you can change the format using the following variable:
+
+.. code-block:: bash
+
+   export THEME_CLOCK_FORMAT="%H:%M:%S"
+
+The time/date is printed by the ``date`` command, so refer to its man page to change the format.
+
+Soft Separators
+^^^^^^^^^^^^^^^
+
+Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
+
+Segment Order
+^^^^^^^^^^^^^
+
+The contents of both prompt sides can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
+
+
+* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
+* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
+* ``clock`` - Current time in ``HH:MM:SS`` format
+* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
+* ``hostname`` - Host name of machine
+* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
+* ``k8s_context`` - Show current kubernetes context
+* ``last_status`` - Exit status of last run command
+* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
+  and ``conda`` supported)
+* ``ruby`` - Current ruby version if using ``rvm``
+* ``node`` - Current node version (only ``nvm`` is supported)
+* ``scm`` - Version control information, ``git``
+* ``terraform`` - Current terraform workspace
+* ``user_info`` - Current user
+* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
+  hierarchy, only the directory you're currently in.
+* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
+* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
+* ``history_number`` - Show current history number
+* ``command_number`` - Show current command number
+
+Two variables can be defined to set the order of the prompt segments:
+
+.. code-block:: bash
+
+   export POWERLINE_LEFT_PROMPT="scm python_venv ruby cwd"
+   export POWERLINE_RIGHT_PROMPT="in_vim clock battery user_info"
+
+The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the corresponding variable.
+
+Padding
+^^^^^^^
+
+To get the length of the left and right segments right, a *padding* value is used.
+In most cases, the default value (\ *2*\ ) works fine, but on some operating systems, this needs to be adjusted.
+One example is *macOS High Sierra*\ , where the default padding causes the right segment to extend to the next line.
+On macOS High Sierra, the padding value needs to be changed to *3* to make the theme look right.
+This can be done by setting the ``POWERLINE_PADDING`` variable before Bash-it is loaded, e.g. in your ``~/.bash_profile`` or ``~/.bashrc`` file:
+
+.. code-block:: bash
+
+   export POWERLINE_PADDING=3
+
+Compact Settings
+^^^^^^^^^^^^^^^^
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Variable
+     - Description
+   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
+     - Removes the leading space before each separator
+   * - POWERLINE_COMPACT_AFTER_SEPARATOR
+     - Removes the trailing space after each separator
+   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
+     - Removes the leading space on the first segment
+   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
+     - Removes the trailing space on the last segment
+   * - POWERLINE_COMPACT_PROMPT
+     - Removes the space after the prompt character
+   * - POWERLINE_COMPACT
+     - Enable all Compact settings (you can still override individual settings)
+
+
+The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
+
+**Multiline Mode Right Prompt**
+
+For the purposes of the ``Compact`` settings, the segments within the **Right Prompt** are considered to run "right-to-left", i.e.:
+
+
+* The **right-most** segment is considered to be the ``"first"`` segment, while the **left-most** segment is considered to be the ``"last"``
+* The space to the **right** of the separator character is considered to be ``"before"``\ , while the space to the **left** is considered to be ``"after"``
diff --git a/docs/themes-list/powerline-naked.rst b/docs/themes-list/powerline-naked.rst
new file mode 100644
index 00000000..3a4e07d4
--- /dev/null
+++ b/docs/themes-list/powerline-naked.rst
@@ -0,0 +1,121 @@
+.. _powerline_naked:
+
+Powerline Naked Theme
+=====================
+
+A colorful theme, where shows a lot information about your shell session.
+
+**IMPORTANT:** This theme requires that `a font with the Powerline symbols <https://github.com/powerline/fonts>`_ needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
+
+Provided Information
+--------------------
+
+
+* Current path
+* Current username and hostname
+* Current time
+* Current shell level
+* Current dirstack level (\ ``pushd`` / ``popd``\ )
+* Current history number
+* Current command number
+* An indicator when connected by SSH
+* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
+* An indicator when the current shell is inside the Vim editor
+* Battery charging status (depends on the battery plugin)
+* SCM Repository status (e.g. Git, SVN)
+* The current Kubernetes environment
+* The current Python environment (Virtualenv, venv, and Conda are supported) in use
+* The current Ruby environment (rvm and rbenv are supported) in use
+* Last command exit code (only shown when the exit code is greater than 0)
+
+Configuration
+-------------
+
+This theme is pretty configurable, all the configuration is done by setting environment variables.
+
+User Information
+^^^^^^^^^^^^^^^^
+
+By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
+
+.. code-block::
+
+   POWERLINE_PROMPT_USER_INFO_MODE="sudo"
+
+
+For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
+
+Clock Format
+^^^^^^^^^^^^
+
+You can change the format using the following variable:
+
+.. code-block::
+
+   THEME_CLOCK_FORMAT="%H:%M:%S"
+
+
+The time/date is printed by the ``date`` command, so refer to its man page to change the format.
+
+Segment Order
+^^^^^^^^^^^^^
+
+The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
+
+
+* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
+* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
+* ``clock`` - Current time in ``HH:MM:SS`` format
+* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
+* ``hostname`` - Host name of machine
+* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
+* ``k8s_context`` - Show current kubernetes context
+* ``last_status`` - Exit status of last run command
+* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
+  and ``conda`` supported)
+* ``ruby`` - Current ruby version if using ``rvm``
+* ``node`` - Current node version (only ``nvm`` is supported)
+* ``scm`` - Version control information, ``git``
+* ``terraform`` - Current terraform workspace
+* ``user_info`` - Current user
+* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
+  hierarchy, only the directory you're currently in.
+* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
+* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
+* ``history_number`` - Show current history number
+* ``command_number`` - Show current command number
+
+A variable can be defined to set the order of the prompt segments:
+
+.. code-block::
+
+   POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
+
+
+The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+Compact Settings
+^^^^^^^^^^^^^^^^
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Variable
+     - Description
+   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
+     - Removes the leading space before each separator
+   * - POWERLINE_COMPACT_AFTER_SEPARATOR
+     - Removes the trailing space after each separator
+   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
+     - Removes the leading space on the first segment
+   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
+     - Removes the trailing space on the last segment
+   * - POWERLINE_COMPACT_PROMPT
+     - Removes the space after the prompt character
+   * - POWERLINE_COMPACT
+     - Enable all Compact settings (you can still override individual settings)
+
+
+The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
diff --git a/docs/themes-list/powerline-plain.rst b/docs/themes-list/powerline-plain.rst
new file mode 100644
index 00000000..ae575f57
--- /dev/null
+++ b/docs/themes-list/powerline-plain.rst
@@ -0,0 +1,121 @@
+.. _powerline_plain:
+
+Powerline Plain Theme
+=====================
+
+A colorful theme, where shows a lot information about your shell session.
+
+Provided Information
+--------------------
+
+
+* Current path
+* Current username and hostname
+* Current time
+* Current shell level
+* Current dirstack level (\ ``pushd`` / ``popd``\ )
+* Current history number
+* Current command number
+* An indicator when connected by SSH
+* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
+* An indicator when the current shell is inside the Vim editor
+* Battery charging status (depends on the battery plugin)
+* SCM Repository status (e.g. Git, SVN)
+* The current Kubernetes environment
+* The current Python environment (Virtualenv, venv, and Conda are supported) in use
+* The current Ruby environment (rvm and rbenv are supported) in use
+* Last command exit code (only shown when the exit code is greater than 0)
+
+Configuration
+-------------
+
+This theme is pretty configurable, all the configuration is done by setting environment variables.
+
+User Information
+^^^^^^^^^^^^^^^^
+
+By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
+
+.. code-block::
+
+   POWERLINE_PROMPT_USER_INFO_MODE="sudo"
+
+
+For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
+
+Clock Format
+^^^^^^^^^^^^
+
+You can change the format using the following variable:
+
+.. code-block::
+
+   THEME_CLOCK_FORMAT="%H:%M:%S"
+
+
+The time/date is printed by the ``date`` command, so refer to its man page to change the format.
+
+Segment Order
+^^^^^^^^^^^^^
+
+The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
+
+
+* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
+* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
+* ``clock`` - Current time in ``HH:MM:SS`` format
+* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
+* ``hostname`` - Host name of machine
+* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
+* ``k8s_context`` - Show current kubernetes context
+* ``last_status`` - Exit status of last run command
+* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
+  and ``conda`` supported)
+* ``ruby`` - Current ruby version if using ``rvm``
+* ``node`` - Current node version (only ``nvm`` is supported)
+* ``scm`` - Version control information, ``git``
+* ``terraform`` - Current terraform workspace
+* ``user_info`` - Current user
+* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
+  hierarchy, only the directory you're currently in.
+* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
+* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
+* ``history_number`` - Show current history number
+* ``command_number`` - Show current command number
+
+A variable can be defined to set the order of the prompt segments:
+
+.. code-block::
+
+   POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
+
+
+The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+Compact Settings
+^^^^^^^^^^^^^^^^
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Variable
+     - Description
+   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
+     - Removes the leading space before each separator
+   * - POWERLINE_COMPACT_AFTER_SEPARATOR
+     - Removes the trailing space after each separator
+   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
+     - Removes the leading space on the first segment
+   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
+     - Removes the trailing space on the last segment
+   * - POWERLINE_COMPACT_PROMPT
+     - Removes the space after the prompt character
+   * - POWERLINE_COMPACT
+     - Enable all Compact settings (you can still override individual settings)
+   * - POWERLINE_PROMPT_AFTER
+     - Adds characters after the prompt
+
+
+The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
diff --git a/docs/themes-list/powerline.rst b/docs/themes-list/powerline.rst
new file mode 100644
index 00000000..7afd866d
--- /dev/null
+++ b/docs/themes-list/powerline.rst
@@ -0,0 +1,128 @@
+.. _powerline:
+
+Powerline Theme
+===============
+
+A colorful theme, where shows a lot information about your shell session.
+
+**IMPORTANT:** This theme requires that `a font with the Powerline symbols <https://github.com/powerline/fonts>`_ needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
+
+**NOTICE:** The default behavior of this theme assumes that you have sudo privileges on your workstation. If that is not the case (e.g. if you are running on a corporate network where ``sudo`` usage is tracked), you can set the flag 'export THEME_CHECK_SUDO=false' in your ``~/.bashrc`` or ``~/.bash_profile`` to disable the Powerline theme's ``sudo`` check. This will apply to all ``powerline*`` themes.
+
+Provided Information
+--------------------
+
+
+* Current path
+* Current username and hostname
+* Current time
+* Current shell level
+* Current dirstack level (\ ``pushd`` / ``popd``\ )
+* Current history number
+* Current command number
+* An indicator when connected by SSH
+* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
+* An indicator when the current shell is inside the Vim editor
+* Battery charging status (depends on the battery plugin)
+* SCM Repository status (e.g. Git, SVN)
+* The current Kubernetes environment
+* The current Python environment (Virtualenv, venv, and Conda are supported) in use
+* The current Ruby environment (rvm and rbenv are supported) in use
+* Last command exit code (only shown when the exit code is greater than 0)
+
+Configuration
+-------------
+
+This theme is pretty configurable, all the configuration is done by setting environment variables.
+
+User Information
+^^^^^^^^^^^^^^^^
+
+By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
+
+.. code-block:: bash
+
+   export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
+
+
+For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
+
+Clock Format
+^^^^^^^^^^^^
+
+You can change the format using the following variable:
+
+.. code-block:: bash
+
+   export THEME_CLOCK_FORMAT="%H:%M:%S"
+
+
+The time/date is printed by the ``date`` command, so refer to its man page to change the format.
+
+Soft Separators
+^^^^^^^^^^^^^^^
+
+Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
+
+Segment Order
+^^^^^^^^^^^^^
+
+The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
+
+
+* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
+* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
+* ``clock`` - Current time in ``HH:MM:SS`` format
+* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
+* ``hostname`` - Host name of machine
+* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
+* ``k8s_context`` - Show current kubernetes context
+* ``last_status`` - Exit status of last run command
+* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
+  and ``conda`` supported)
+* ``ruby`` - Current ruby version if using ``rvm``
+* ``node`` - Current node version (only ``nvm`` is supported)
+* ``scm`` - Version control information, ``git``
+* ``terraform`` - Current terraform workspace
+* ``user_info`` - Current user
+* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
+  hierarchy, only the directory you're currently in.
+* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
+* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
+* ``history_number`` - Show current history number
+* ``command_number`` - Show current command number
+
+A variable can be defined to set the order of the prompt segments:
+
+.. code-block::
+
+   POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
+
+
+The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+Compact Settings
+^^^^^^^^^^^^^^^^
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Variable
+     - Description
+   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
+     - Removes the leading space before each separator
+   * - POWERLINE_COMPACT_AFTER_SEPARATOR
+     - Removes the trailing space after each separator
+   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
+     - Removes the leading space on the first segment
+   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
+     - Removes the trailing space on the last segment
+   * - POWERLINE_COMPACT_PROMPT
+     - Removes the space after the prompt character
+   * - POWERLINE_COMPACT
+     - Enable all Compact settings (you can still override individual settings)
+
+
+The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
diff --git a/docs/themes-list/radek.rst b/docs/themes-list/radek.rst
new file mode 100644
index 00000000..333999cc
--- /dev/null
+++ b/docs/themes-list/radek.rst
@@ -0,0 +1,25 @@
+.. _radek:
+
+Radek Theme
+===========
+
+A colorful theme for Python developers.
+It does not have any requirements.
+
+Provided Information
+--------------------
+
+
+* Current username and hostname
+* Current path
+* Git repository status
+* Current Python environment (venv, Conda )
+* Current Python version
+
+Examples
+--------
+
+.. code-block:: bash
+
+   [radek@photon][~/src/nokia2/cbis] ±[master → origin ↑1 {1}✓][venv-cbis][py-3.7.5]
+   →
diff --git a/themes/redline/screenshot.png b/docs/themes-list/redline.png
similarity index 100%
rename from themes/redline/screenshot.png
rename to docs/themes-list/redline.png
diff --git a/docs/themes-list/redline.rst b/docs/themes-list/redline.rst
new file mode 100644
index 00000000..ba5abcf4
--- /dev/null
+++ b/docs/themes-list/redline.rst
@@ -0,0 +1,56 @@
+.. _redline:
+
+Redline Theme
+=============
+
+changed up the powerline base a little.
+
+It plays nicest with  this font: `DroidSansMonoForPowerline <https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/DroidSansMono>`_
+
+Read the :ref:`powerline theme documentation <powerline>`
+
+added
+-----
+
+
+* hostname
+* distro logo
+
+changed
+-------
+
+
+* sudo credential check
+* required font
+* some icons
+
+Works real good like with:
+
+.. code-block:: bash
+
+   ## set the theme
+   export BASH_IT_THEME='redline'
+
+   # Set this to false to turn off version control status checking within the prompt for all themes
+   export SCM_CHECK=true
+
+   ## Set Xterm/screen/Tmux title with only a short hostname.
+   export SHORT_HOSTNAME=$(hostname -s)
+
+   ## enable sudo prompt
+   export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
+
+   ## prompt part string
+   export POWERLINE_PROMPT="python_venv user_info hostname cwd scm"
+
+enable your distro logo with
+----------------------------
+
+.. code-block:: bash
+
+   export POWERLINE_PROMPT_DISTRO_LOGO="yes"
+
+
+.. image:: redline.png
+   :target: redline.png?raw=true
+   :alt: screenshot

From d3d9a79f1ead47619756bd83719f2ef66e6268e1 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 30 Oct 2020 19:13:41 +0200
Subject: [PATCH 383/388] docs: Update contributing theme guidelines

---
 docs/contributing.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 9964e03c..98c37761 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -105,5 +105,5 @@ Themes
 
 * When adding a new theme, please include a screenshot and a short description about what makes this theme unique in the Pull Request's description field.
   Please do not add theme screenshots to the repo itself, as they will add unnecessary bloat to the repo.
-  The project's Wiki has a *Themes* page where you can add a screenshot if you want.
-* Ideally, each theme's folder should contain a ``README.md`` file describing the theme and its configuration options.
+  The project's docs has a `Themes page <https://github.com/Bash-it/bash-it/blob/master/docs/themes-list/index.rst>`_ where you can add a screenshot if you want (by link).
+* Ideally, you should add a ``<theme_name>.rst`` file describing the theme and its configuration options to ``docs/themes-list`` folder.

From 60c8b4be9f485f0df3728e53c383cc0df6dfbc73 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Fri, 4 Dec 2020 17:22:51 +0200
Subject: [PATCH 384/388] docs: Move powerline theme docs into
 powerline-base.rst

---
 docs/themes-list/powerline-base.rst      | 127 +++++++++++++++++++++++
 docs/themes-list/powerline-multiline.rst | 116 +--------------------
 docs/themes-list/powerline-naked.rst     | 116 +--------------------
 docs/themes-list/powerline-plain.rst     | 117 +--------------------
 docs/themes-list/powerline.rst           | 117 +--------------------
 5 files changed, 139 insertions(+), 454 deletions(-)
 create mode 100644 docs/themes-list/powerline-base.rst

diff --git a/docs/themes-list/powerline-base.rst b/docs/themes-list/powerline-base.rst
new file mode 100644
index 00000000..d0f6ab30
--- /dev/null
+++ b/docs/themes-list/powerline-base.rst
@@ -0,0 +1,127 @@
+.. _powerline_base:
+
+Base Powerline Theme Information
+================================
+
+This page explains base powerline theme information, shared between
+all powerline themes.
+
+**IMPORTANT:** This theme requires that `a font with the Powerline symbols <https://github.com/powerline/fonts>`_ needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
+
+**NOTICE:** The default behavior of this theme assumes that you have sudo privileges on your workstation. If that is not the case (e.g. if you are running on a corporate network where ``sudo`` usage is tracked), you can set the flag 'export THEME_CHECK_SUDO=false' in your ``~/.bashrc`` or ``~/.bash_profile`` to disable the Powerline theme's ``sudo`` check. This will apply to all ``powerline*`` themes.
+
+Provided Information
+--------------------
+
+
+* Current path
+* Current username and hostname
+* Current time
+* Current shell level
+* Current dirstack level (\ ``pushd`` / ``popd``\ )
+* Current history number
+* Current command number
+* An indicator when connected by SSH
+* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
+* An indicator when the current shell is inside the Vim editor
+* Battery charging status (depends on the battery plugin)
+* SCM Repository status (e.g. Git, SVN)
+* The current Kubernetes environment
+* The current Python environment (Virtualenv, venv, and Conda are supported) in use
+* The current Ruby environment (rvm and rbenv are supported) in use
+* Last command exit code (only shown when the exit code is greater than 0)
+
+Configuration
+-------------
+
+This theme is pretty configurable, all the configuration is done by setting environment variables.
+
+User Information
+^^^^^^^^^^^^^^^^
+
+By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
+
+.. code-block:: bash
+
+   export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
+
+
+For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
+
+Clock Format
+^^^^^^^^^^^^
+
+You can change the format using the following variable:
+
+.. code-block:: bash
+
+   export THEME_CLOCK_FORMAT="%H:%M:%S"
+
+
+The time/date is printed by the ``date`` command, so refer to its man page to change the format.
+
+Segment Order
+^^^^^^^^^^^^^
+
+The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
+
+
+* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
+* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
+* ``clock`` - Current time in ``HH:MM:SS`` format
+* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
+* ``hostname`` - Host name of machine
+* ``in_toolbox`` - Show identifier if running inside a `toolbox <https://github.com/containers/toolbox>`_
+* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
+* ``k8s_context`` - Show current kubernetes context
+* ``last_status`` - Exit status of last run command
+* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
+  and ``conda`` supported)
+* ``ruby`` - Current ruby version if using ``rvm``
+* ``node`` - Current node version (only ``nvm`` is supported)
+* ``scm`` - Version control information, ``git``
+* ``terraform`` - Current terraform workspace
+* ``user_info`` - Current user
+* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
+  hierarchy, only the directory you're currently in.
+* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
+* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
+* ``history_number`` - Show current history number
+* ``command_number`` - Show current command number
+
+A variable can be defined to set the order of the prompt segments:
+
+.. code-block::
+
+   POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
+
+
+The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
+
+.. _powerline_compact_settings:
+
+Compact Settings
+^^^^^^^^^^^^^^^^
+
+You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Variable
+     - Description
+   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
+     - Removes the leading space before each separator
+   * - POWERLINE_COMPACT_AFTER_SEPARATOR
+     - Removes the trailing space after each separator
+   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
+     - Removes the leading space on the first segment
+   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
+     - Removes the trailing space on the last segment
+   * - POWERLINE_COMPACT_PROMPT
+     - Removes the space after the prompt character
+   * - POWERLINE_COMPACT
+     - Enable all Compact settings (you can still override individual settings)
+
+
+The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
diff --git a/docs/themes-list/powerline-multiline.rst b/docs/themes-list/powerline-multiline.rst
index 41cf0cf6..f525f022 100644
--- a/docs/themes-list/powerline-multiline.rst
+++ b/docs/themes-list/powerline-multiline.rst
@@ -5,97 +5,13 @@ Powerline Multiline Theme
 
 A colorful multiline theme, where the first line shows information about your shell session (divided into two parts, left and right), and the second one is where the shell commands are introduced.
 
-**IMPORTANT:** This theme requires that `a font with the Powerline symbols <https://github.com/powerline/fonts>`_ needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
-
-Provided Information
---------------------
-
-
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (\ ``pushd`` / ``popd``\ )
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the battery plugin)
-* SCM Repository status (e.g. Git, SVN)
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-Configuration
--------------
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-User Information
-^^^^^^^^^^^^^^^^
-
-By default, the username and hostname are shown on the right hand side, but you can change this behavior by setting the value of the following variable:
-
-.. code-block:: bash
-
-   export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
-
-Clock Format
-^^^^^^^^^^^^
-
-By default, the current time is shown on the right hand side, you can change the format using the following variable:
-
-.. code-block:: bash
-
-   export THEME_CLOCK_FORMAT="%H:%M:%S"
-
-The time/date is printed by the ``date`` command, so refer to its man page to change the format.
+See :ref:`powerline_base` for general information about the powerline theme.
 
 Soft Separators
 ^^^^^^^^^^^^^^^
 
 Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
 
-Segment Order
-^^^^^^^^^^^^^
-
-The contents of both prompt sides can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-
-* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
-* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
-* ``clock`` - Current time in ``HH:MM:SS`` format
-* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
-* ``hostname`` - Host name of machine
-* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
-* ``k8s_context`` - Show current kubernetes context
-* ``last_status`` - Exit status of last run command
-* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
-  and ``conda`` supported)
-* ``ruby`` - Current ruby version if using ``rvm``
-* ``node`` - Current node version (only ``nvm`` is supported)
-* ``scm`` - Version control information, ``git``
-* ``terraform`` - Current terraform workspace
-* ``user_info`` - Current user
-* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
-* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
-* ``history_number`` - Show current history number
-* ``command_number`` - Show current command number
-
-Two variables can be defined to set the order of the prompt segments:
-
-.. code-block:: bash
-
-   export POWERLINE_LEFT_PROMPT="scm python_venv ruby cwd"
-   export POWERLINE_RIGHT_PROMPT="in_vim clock battery user_info"
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the corresponding variable.
-
 Padding
 ^^^^^^^
 
@@ -109,35 +25,11 @@ This can be done by setting the ``POWERLINE_PADDING`` variable before Bash-it is
 
    export POWERLINE_PADDING=3
 
-Compact Settings
-^^^^^^^^^^^^^^^^
 
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
+Multiline Mode Right Prompt
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. list-table::
-   :header-rows: 1
-
-   * - Variable
-     - Description
-   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
-     - Removes the leading space before each separator
-   * - POWERLINE_COMPACT_AFTER_SEPARATOR
-     - Removes the trailing space after each separator
-   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
-     - Removes the leading space on the first segment
-   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
-     - Removes the trailing space on the last segment
-   * - POWERLINE_COMPACT_PROMPT
-     - Removes the space after the prompt character
-   * - POWERLINE_COMPACT
-     - Enable all Compact settings (you can still override individual settings)
-
-
-The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
-
-**Multiline Mode Right Prompt**
-
-For the purposes of the ``Compact`` settings, the segments within the **Right Prompt** are considered to run "right-to-left", i.e.:
+For the purposes of the :ref:`Compact <powerline_compact_settings>` settings, the segments within the **Right Prompt** are considered to run "right-to-left", i.e.:
 
 
 * The **right-most** segment is considered to be the ``"first"`` segment, while the **left-most** segment is considered to be the ``"last"``
diff --git a/docs/themes-list/powerline-naked.rst b/docs/themes-list/powerline-naked.rst
index 3a4e07d4..cf4b0869 100644
--- a/docs/themes-list/powerline-naked.rst
+++ b/docs/themes-list/powerline-naked.rst
@@ -4,118 +4,6 @@ Powerline Naked Theme
 =====================
 
 A colorful theme, where shows a lot information about your shell session.
+The naked powerline theme provides a cleaner shell with less background colors.
 
-**IMPORTANT:** This theme requires that `a font with the Powerline symbols <https://github.com/powerline/fonts>`_ needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
-
-Provided Information
---------------------
-
-
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (\ ``pushd`` / ``popd``\ )
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the battery plugin)
-* SCM Repository status (e.g. Git, SVN)
-* The current Kubernetes environment
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-Configuration
--------------
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-User Information
-^^^^^^^^^^^^^^^^
-
-By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
-
-.. code-block::
-
-   POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-
-For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
-
-Clock Format
-^^^^^^^^^^^^
-
-You can change the format using the following variable:
-
-.. code-block::
-
-   THEME_CLOCK_FORMAT="%H:%M:%S"
-
-
-The time/date is printed by the ``date`` command, so refer to its man page to change the format.
-
-Segment Order
-^^^^^^^^^^^^^
-
-The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-
-* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
-* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
-* ``clock`` - Current time in ``HH:MM:SS`` format
-* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
-* ``hostname`` - Host name of machine
-* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
-* ``k8s_context`` - Show current kubernetes context
-* ``last_status`` - Exit status of last run command
-* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
-  and ``conda`` supported)
-* ``ruby`` - Current ruby version if using ``rvm``
-* ``node`` - Current node version (only ``nvm`` is supported)
-* ``scm`` - Version control information, ``git``
-* ``terraform`` - Current terraform workspace
-* ``user_info`` - Current user
-* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
-* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
-* ``history_number`` - Show current history number
-* ``command_number`` - Show current command number
-
-A variable can be defined to set the order of the prompt segments:
-
-.. code-block::
-
-   POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
-
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
-
-Compact Settings
-^^^^^^^^^^^^^^^^
-
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Variable
-     - Description
-   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
-     - Removes the leading space before each separator
-   * - POWERLINE_COMPACT_AFTER_SEPARATOR
-     - Removes the trailing space after each separator
-   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
-     - Removes the leading space on the first segment
-   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
-     - Removes the trailing space on the last segment
-   * - POWERLINE_COMPACT_PROMPT
-     - Removes the space after the prompt character
-   * - POWERLINE_COMPACT
-     - Enable all Compact settings (you can still override individual settings)
-
-
-The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
+See :ref:`powerline_base` for general information about the powerline theme.
diff --git a/docs/themes-list/powerline-plain.rst b/docs/themes-list/powerline-plain.rst
index ae575f57..a7f47c5a 100644
--- a/docs/themes-list/powerline-plain.rst
+++ b/docs/themes-list/powerline-plain.rst
@@ -4,118 +4,11 @@ Powerline Plain Theme
 =====================
 
 A colorful theme, where shows a lot information about your shell session.
+The plain powerline theme provides a simpler shell with less information.
 
-Provided Information
---------------------
+See :ref:`powerline_base` for general information about the powerline theme.
 
+Soft Separators
+^^^^^^^^^^^^^^^
 
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (\ ``pushd`` / ``popd``\ )
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the battery plugin)
-* SCM Repository status (e.g. Git, SVN)
-* The current Kubernetes environment
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-Configuration
--------------
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-User Information
-^^^^^^^^^^^^^^^^
-
-By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
-
-.. code-block::
-
-   POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-
-For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
-
-Clock Format
-^^^^^^^^^^^^
-
-You can change the format using the following variable:
-
-.. code-block::
-
-   THEME_CLOCK_FORMAT="%H:%M:%S"
-
-
-The time/date is printed by the ``date`` command, so refer to its man page to change the format.
-
-Segment Order
-^^^^^^^^^^^^^
-
-The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-
-* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
-* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
-* ``clock`` - Current time in ``HH:MM:SS`` format
-* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
-* ``hostname`` - Host name of machine
-* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
-* ``k8s_context`` - Show current kubernetes context
-* ``last_status`` - Exit status of last run command
-* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
-  and ``conda`` supported)
-* ``ruby`` - Current ruby version if using ``rvm``
-* ``node`` - Current node version (only ``nvm`` is supported)
-* ``scm`` - Version control information, ``git``
-* ``terraform`` - Current terraform workspace
-* ``user_info`` - Current user
-* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
-* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
-* ``history_number`` - Show current history number
-* ``command_number`` - Show current command number
-
-A variable can be defined to set the order of the prompt segments:
-
-.. code-block::
-
-   POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
-
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
-
-Compact Settings
-^^^^^^^^^^^^^^^^
-
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Variable
-     - Description
-   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
-     - Removes the leading space before each separator
-   * - POWERLINE_COMPACT_AFTER_SEPARATOR
-     - Removes the trailing space after each separator
-   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
-     - Removes the leading space on the first segment
-   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
-     - Removes the trailing space on the last segment
-   * - POWERLINE_COMPACT_PROMPT
-     - Removes the space after the prompt character
-   * - POWERLINE_COMPACT
-     - Enable all Compact settings (you can still override individual settings)
-   * - POWERLINE_PROMPT_AFTER
-     - Adds characters after the prompt
-
-
-The default value for all settings is ``0`` (disabled). Use ``1`` to enable.
+Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
diff --git a/docs/themes-list/powerline.rst b/docs/themes-list/powerline.rst
index 7afd866d..afd63ece 100644
--- a/docs/themes-list/powerline.rst
+++ b/docs/themes-list/powerline.rst
@@ -5,124 +5,9 @@ Powerline Theme
 
 A colorful theme, where shows a lot information about your shell session.
 
-**IMPORTANT:** This theme requires that `a font with the Powerline symbols <https://github.com/powerline/fonts>`_ needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
-
-**NOTICE:** The default behavior of this theme assumes that you have sudo privileges on your workstation. If that is not the case (e.g. if you are running on a corporate network where ``sudo`` usage is tracked), you can set the flag 'export THEME_CHECK_SUDO=false' in your ``~/.bashrc`` or ``~/.bash_profile`` to disable the Powerline theme's ``sudo`` check. This will apply to all ``powerline*`` themes.
-
-Provided Information
---------------------
-
-
-* Current path
-* Current username and hostname
-* Current time
-* Current shell level
-* Current dirstack level (\ ``pushd`` / ``popd``\ )
-* Current history number
-* Current command number
-* An indicator when connected by SSH
-* An indicator when ``sudo`` has the credentials cached (see the ``sudo`` manpage for more info about this)
-* An indicator when the current shell is inside the Vim editor
-* Battery charging status (depends on the battery plugin)
-* SCM Repository status (e.g. Git, SVN)
-* The current Kubernetes environment
-* The current Python environment (Virtualenv, venv, and Conda are supported) in use
-* The current Ruby environment (rvm and rbenv are supported) in use
-* Last command exit code (only shown when the exit code is greater than 0)
-
-Configuration
--------------
-
-This theme is pretty configurable, all the configuration is done by setting environment variables.
-
-User Information
-^^^^^^^^^^^^^^^^
-
-By default, the username and hostname are shown, but you can change this behavior by setting the value of the following variable:
-
-.. code-block:: bash
-
-   export POWERLINE_PROMPT_USER_INFO_MODE="sudo"
-
-
-For now, the only supported value is ``sudo``\ , which hides the username and hostname, and shows an indicator when ``sudo`` has the credentials cached. Other values have no effect at this time.
-
-Clock Format
-^^^^^^^^^^^^
-
-You can change the format using the following variable:
-
-.. code-block:: bash
-
-   export THEME_CLOCK_FORMAT="%H:%M:%S"
-
-
-The time/date is printed by the ``date`` command, so refer to its man page to change the format.
+See :ref:`powerline_base` for general information about the powerline theme.
 
 Soft Separators
 ^^^^^^^^^^^^^^^
 
 Adjacent segments having the same background color will use a less-pronouced (i.e. soft) separator between them.
-
-Segment Order
-^^^^^^^^^^^^^
-
-The contents of the prompt can be "reordered", all the "segments" (every piece of information) can take any place. The currently available segments are:
-
-
-* ``aws_profile`` - Show the current value of the ``AWS_PROFILE`` environment variable
-* ``battery`` - Battery information (you'll need to enable the ``battery`` plugin)
-* ``clock`` - Current time in ``HH:MM:SS`` format
-* ``cwd`` - Current working directory including full folder hierarchy (c.f. ``wd``\ )
-* ``hostname`` - Host name of machine
-* ``in_vim`` - Show identifier if running in ``:terminal`` from vim
-* ``k8s_context`` - Show current kubernetes context
-* ``last_status`` - Exit status of last run command
-* ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
-  and ``conda`` supported)
-* ``ruby`` - Current ruby version if using ``rvm``
-* ``node`` - Current node version (only ``nvm`` is supported)
-* ``scm`` - Version control information, ``git``
-* ``terraform`` - Current terraform workspace
-* ``user_info`` - Current user
-* ``wd`` - Working directory, like ``cwd`` but doesn't show the full folder
-  hierarchy, only the directory you're currently in.
-* ``shlvl`` - Show the current shell level (based on ``SHLVL`` environment variable), but only if you are not in root shell
-* ``dirstack`` - Show the current dirstack level (based on ``DIRSTACK`` environment variable), but only if the stack is not empty
-* ``history_number`` - Show current history number
-* ``command_number`` - Show current command number
-
-A variable can be defined to set the order of the prompt segments:
-
-.. code-block::
-
-   POWERLINE_PROMPT="user_info scm python_venv ruby cwd"
-
-
-The example values above are the current default values, but if you want to remove anything from the prompt, simply remove the "string" that represents the segment from the variable.
-
-Compact Settings
-^^^^^^^^^^^^^^^^
-
-You can configure various aspects of the prompt to use less whitespace. Supported variables are:
-
-.. list-table::
-   :header-rows: 1
-
-   * - Variable
-     - Description
-   * - POWERLINE_COMPACT_BEFORE_SEPARATOR
-     - Removes the leading space before each separator
-   * - POWERLINE_COMPACT_AFTER_SEPARATOR
-     - Removes the trailing space after each separator
-   * - POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT
-     - Removes the leading space on the first segment
-   * - POWERLINE_COMPACT_AFTER_LAST_SEGMENT
-     - Removes the trailing space on the last segment
-   * - POWERLINE_COMPACT_PROMPT
-     - Removes the space after the prompt character
-   * - POWERLINE_COMPACT
-     - Enable all Compact settings (you can still override individual settings)
-
-
-The default value for all settings is ``0`` (disabled). Use ``1`` to enable.

From e7d51070079d7c94d5488950ed8b85b4e6b9931a Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 13 Dec 2020 23:47:39 +0200
Subject: [PATCH 385/388] docs: Improve contributing add-screenshot
 instructions

---
 docs/contributing.rst | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 98c37761..655d05bd 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -105,5 +105,14 @@ Themes
 
 * When adding a new theme, please include a screenshot and a short description about what makes this theme unique in the Pull Request's description field.
   Please do not add theme screenshots to the repo itself, as they will add unnecessary bloat to the repo.
-  The project's docs has a `Themes page <https://github.com/Bash-it/bash-it/blob/master/docs/themes-list/index.rst>`_ where you can add a screenshot if you want (by link).
+  The project's docs has a `Themes page <https://github.com/Bash-it/bash-it/blob/master/docs/themes-list/index.rst>`_ where you should add a screenshot, see how :ref:`here<add_screenshot>`.
 * Ideally, you should add a ``<theme_name>.rst`` file describing the theme and its configuration options to ``docs/themes-list`` folder.
+
+.. _add_screenshot:
+
+Adding a Screenshot
+-------------------
+
+In order to add a new screenshot, use the ``gh-pages`` branch.
+Add your new screenshot to the ``docs/images`` folder, and open a PR.
+In the `Themes page <https://github.com/Bash-it/bash-it/blob/master/docs/themes-list/index.rst>`_, see the other screenshots to know what kind of link you should use.

From 0d7f145ef4f9c8487fc40a989500dab923aa6044 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 14 Dec 2020 00:28:57 +0200
Subject: [PATCH 386/388] readme: Change join chat to IRC from gitter

---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index f8e94995..ee233fc4 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # Bash-it
 ![Build Status](https://github.com/Bash-it/bash-it/workflows/CI/badge.svg?branch=master)
-[![Join the chat at https://gitter.im/Bash-it/bash-it](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Bash-it/bash-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://webchat.freenode.net/?channel=#bash-it](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](https://webchat.freenode.net/?channel=#bash-it)
 
 **Bash-it** is a collection of community Bash commands and scripts for Bash 3.2+.
 (And a shameless ripoff of [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) :smiley:)

From b5fecb3eb30228f4016bb6fd4b3f01b6de52bc2e Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 14 Dec 2020 00:47:32 +0200
Subject: [PATCH 387/388] readme: Add docs status badge

---
 docs/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/README.md b/docs/README.md
index ee233fc4..39753bbd 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,5 +1,6 @@
 # Bash-it
 ![Build Status](https://github.com/Bash-it/bash-it/workflows/CI/badge.svg?branch=master)
+![Docs Status](https://readthedocs.org/projects/bash-it/badge/)
 [![Join the chat at https://webchat.freenode.net/?channel=#bash-it](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](https://webchat.freenode.net/?channel=#bash-it)
 
 **Bash-it** is a collection of community Bash commands and scripts for Bash 3.2+.

From 654a49cbd81b56a2ec7d13eadec7082b0bc5f0c0 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 14 Dec 2020 00:49:26 +0200
Subject: [PATCH 388/388] docs: Add readthedocs main page to readme

---
 docs/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/README.md b/docs/README.md
index f8e94995..1aa255c4 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -11,6 +11,7 @@ Bash-it provides a solid framework for using, developing and maintaining shell s
 If you're using the _Bourne Again Shell_ (Bash) regularly and have been looking for an easy way on how to keep all of these nice little scripts and aliases under control, then Bash-it is for you!
 Stop polluting your `~/bin` directory and your `.bashrc` file, fork/clone Bash-it and start hacking away.
 
+- [Main Page](https://bash-it.readthedocs.io/en/latest)
 - [Contributing](#contributing)
 - [Installation](https://bash-it.readthedocs.io/en/latest/installation)
   - [Install Options](https://bash-it.readthedocs.io/en/latest/installation/#install-options)