fix (completion): suppress 1091 in brew (#2130)

Allows for setting "COMMAND_DURATION_MIN_SECONDS" to more than 60 seconds without adding to prompt. Previously always showed with lengths over 60 seconds regardless of setting.

.editorconfig

@@ -9,22 +9,28 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{md,rst}]
+[**.{md,rst}]
 trim_trailing_whitespace = false
 
 [.git*]
+indent_size = tab
 indent_style = tab
 
-[*.*sh]
+[{**.*sh,test/run,**.bats}]
+indent_size = tab
 indent_style = tab
-indent_size = 4
 
 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
+keep_padding       = false # like -kp
 end_of_line        = lf
 charset            = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[**.bats]
+indent_size = tab
+indent_style = tab
+shell_variant	= bats

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,46 +0,0 @@
----
-name: Bug report
-about: Create a bug report to help us improve
-title: ''
-labels: bug:general
-assignees: ''
-
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Bash-it version used:
-* List of enabled plugins, themes and aliases (use ``bash-it show (plugins/themes/aliases)``):
-* ``bash-it doctor`` output:
-* Bash version:
-* Operating System and version:
-
-## Your Bash Config File
-<!--- Please paste here your bash config file (.bashrc/.bash_profile) -->
-<!--- This will help us debug and locate the problem -->
-```bash
-  # Your bash config file should be here
-```

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,85 @@
+name: 🐛 Bug report
+title: "[Bug]: "
+description: Create a bug report to help us improve
+labels: "bug:general"
+body:
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: Tell us what should happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible solution
+      description: Tell us how it could be fixed at your glance.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Context
+      description: >
+        How has this issue affected you? What are you trying to accomplish?
+        Providing context helps us come up with a solution that is most useful in the real world.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: >
+        Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Bash-it version
+      placeholder: "How to get: bash-it version"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: List of enabled plugins, themes and aliases
+      placeholder: "How to get: bash-it show plugins|themes|aliases (it is not a pipe)"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Bash version
+      placeholder: "How to get: bash --version"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system and version
+      placeholder: "How to get: neofetch (or another command)"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "bash-it doctor output"
+      value: |
+        ```
+        # How to get: bash-it doctor
+        ```
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Your ~/.bashrc
+      value: |
+        ```bash
+        # How to get: cat ~/.bashrc
+        ```
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Notes
+      description: >
+        Provide any extra details here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Libera chat
+    url: https://web.libera.chat/?channel=#bash-it
+    about: You can ask and answer questions here

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature request
-assignees: ''
-
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- Tell us how your feature should work -->
-
-## Current Behavior
-<!--- Explain the difference your feature will have from current behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest ideas on how to implement the addition or change -->
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,34 @@
+name: 💡 Feature request
+title: "[Feature]: "
+description: Suggest an idea for this project
+labels: "feature request"
+body:
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: Tell us how your feature should work.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: Explain the difference your feature will have from current behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible solution
+      description: Tell us how it could be fixed at your glance.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Context
+      description: >
+        How has this issue affected you? What are you trying to accomplish?
+        Providing context helps us come up with a solution that is most useful in the real world.
+  - type: textarea
+    attributes:
+      label: Notes
+      description: >
+        Provide any extra details here.

.github/workflows/ci.yml

@@ -1,17 +1,13 @@
 name: CI
 
 # Triggers the workflow on push or pull request events
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   bats-test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, macos-10.15, macos-11.0]
+        os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11]
 
     runs-on: ${{ matrix.os }}
 
@@ -20,6 +16,9 @@ jobs:
     - name: Install greadlink
       if: startsWith(runner.os, 'macOS')
       run: brew install coreutils
+    - name: Install parallel
+      if: startsWith(runner.os, 'macOS')
+      run: brew install parallel
     - name: Test code
       run: test/run
 
@@ -45,15 +44,22 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.14
+        go-version: 1.17
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
+    # - name: Update APT Package Lists
+      # run: sudo apt-get update
     - name: Install shfmt
       run: GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt
     - name: Install shellcheck
-      run: brew install shellcheck
+      env:
+        scversion: stable # Or latest, vxx, etc
+      run: |
+        wget -qO- "https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz" | tar -xJv "shellcheck-${scversion}/shellcheck"
+        sudo cp "shellcheck-${scversion}/shellcheck" /usr/bin/
+        shellcheck --version
     - name: Install pre-commit
       run: python3 -m pip install -r test/lint-requirements.txt
     - name: Run lint

.gitignore

@@ -17,3 +17,8 @@ bats
 enabled/*
 /enabled
 tmp/
+
+# Do not save profiles
+profiles/*
+# apart from the default one
+!profiles/default.bash_it

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
       - id: mixed-line-ending
       - id: check-added-large-files
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 2.1.4
+    rev: 2.1.5
     hooks:
       - id: git-check  # Configure in .gitattributes
       - id: shellcheck
@@ -28,3 +28,23 @@ repos:
       # - id: forbid-crlf
       - id: remove-crlf
         exclude: ".bat$"
+  - repo: local
+    hooks:
+      - id: dot-sh
+        name: Check .sh files against bash-it requirements
+        entry: ./hooks/dot-sh.sh
+        language: system
+        files: "\\.sh$"
+        types: [file]
+      - id: dot-bash
+        name: Check .bash files against bash-it requirements
+        exclude: "test/test_helper.bash"
+        entry: ./hooks/dot-bash.sh
+        language: system
+        files: "\\.bash$"
+        types: [file]
+      - id: clean-files-txt
+        name: Check that clean_files.txt is sorted alphabetically.
+        entry: ./hooks/check-clean-files-txt.sh
+        language: system
+        files: clean_files.txt

.shellcheckrc

@@ -1,6 +0,0 @@
-# We use colors and not assigned
-disable=SC2154
-# Hard to fix
-disable=SC2155
-# shellcheck is wrong on some
-disable=SC2034

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Bash-it
+Copyright (c) 2020-2021 Bash-it
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

aliases/available/ag.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'the silver searcher (ag) aliases'
 
 ## Summary for args to less:

aliases/available/ansible.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'ansible abbreviations'
 
 alias ans=ansible

aliases/available/apt.aliases.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+# shellcheck shell=bash
 #
 # -binaryanomaly
 
@@ -6,9 +6,8 @@ cite 'about-alias'
 about-alias 'Apt and dpkg aliases for Ubuntu and Debian distros.'
 
 # set apt aliases
-function _set_pkg_aliases()
-{
-	if [ -x $(which apt) ]; then
+function _set_pkg_aliases() {
+	if _command_exists apt; then
 		alias apts='apt-cache search'
 		alias aptshow='apt-cache show'
 		alias aptinst='sudo apt-get install -V'

aliases/available/atom.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'Atom.io editor abbreviations'
 
 alias a='atom'

aliases/available/bash-it.aliases.bash

@@ -1,4 +1,4 @@
-cite about-alias
+# shellcheck shell=bash
 about-alias 'Aliases for the bash-it command (these aliases are automatically included with the "general" aliases)'
 
 # Common misspellings of bash-it

aliases/available/bolt.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'puppet bolt aliases'
 
 # Aliases

aliases/available/bundler.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'ruby bundler'
 
 # Bundler Commands

aliases/available/clipboard.aliases.bash

@@ -1,20 +1,16 @@
-cite 'about-alias'
-about-alias 'pbcopy and pbpaste shortcuts to linux'
+# shellcheck shell=bash
+about-alias 'xclip shortcuts'
 
-case $OSTYPE in
-  linux*)
-    XCLIP=$(command -v xclip)
-    [[ $XCLIP ]] && \
-    alias pbcopy="$XCLIP -selection clipboard" && \
-    alias pbpaste="$XCLIP -selection clipboard -o"
-    ;;
-esac
+alias pbcopy="xclip -selection clipboard"
+alias pbpaste="xclip -selection clipboard -o"
 
+alias xcpy="xclip -selection clipboard"
+alias xpst="xclip -selection clipboard -o"
 # to use it just install xclip on your distribution and it would work like:
-# $ echo "hello" | pbcopy
-# $ pbpaste
+# $ echo "hello" | xcpy
+# $ xpst
 # hello
 
 # very useful for things like:
-# cat ~/.ssh/id_rsa.pub | pbcopy
+# cat ~/.ssh/id_rsa.pub | xcpy
 # have fun!

aliases/available/composer.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'common composer abbreviations'
 
 # Aliases

aliases/available/curl.aliases.bash

@@ -1,12 +1,9 @@
-#!/bin/bash
-
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'Curl aliases for convenience.'
 
 # set apt aliases
-function _set_pkg_aliases()
-{
-	if [ -x $(which curl) ]; then
+function _set_pkg_aliases() {
+	if _command_exists curl; then
 		# follow redirects
 		alias cl='curl -L'
 		# follow redirects, download as original name

aliases/available/dnf.aliases.bash

@@ -0,0 +1,17 @@
+# shellcheck shell=bash
+about-alias 'dnf aliases for fedora 22+ distros'
+
+alias dnfl="dnf list"            # List packages
+alias dnfli="dnf list installed" # List installed packages
+alias dnfgl="dnf grouplist"      # List package groups
+alias dnfmc="dnf makecache"      # Generate metadata cache
+alias dnfp="dnf info"            # Show package information
+alias dnfs="dnf search"          # Search package
+
+alias dnfu="sudo dnf upgrade"       # Upgrade package
+alias dnfi="sudo dnf install"       # Install package
+alias dnfri='sudo dnf reinstall'    # Reinstall package
+alias dnfgi="sudo dnf groupinstall" # Install package group
+alias dnfr="sudo dnf remove"        # Remove package
+alias dnfgr="sudo dnf groupremove"  # Remove package group
+alias dnfc="sudo dnf clean all"     # Clean cache

aliases/available/docker-compose.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'docker-compose abbreviations'
 
 alias dco="docker-compose"
@@ -7,3 +7,4 @@ alias dco="docker-compose"
 alias dcofresh="docker-compose-fresh"
 alias dcol="docker-compose logs -f --tail 100"
 alias dcou="docker-compose up"
+alias dcouns="dcou --no-start"

aliases/available/docker.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'docker abbreviations'
 
 alias dk='docker'
@@ -19,7 +19,7 @@ case $OSTYPE in
 		;;
 esac
 
-if [ ! -z "$(command ls "${BASH_IT}/enabled/"{[0-9][0-9][0-9]${BASH_IT_LOAD_PRIORITY_SEPARATOR}docker,docker}.plugin.bash 2>/dev/null | head -1)" ]; then
+if _bash-it-component-item-is-enabled plugin docker; then
 	# Function aliases from docker plugin:
 	alias dkrmlc='docker-remove-most-recent-container' # Delete most recent (i.e., last) Docker container
 	alias dkrmall='docker-remove-stale-assets'         # Delete all untagged images and exited containers

aliases/available/emacs.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'emacs editor'
 
 case $OSTYPE in

aliases/available/fuck.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'fuck/please to retry last command with sudo'
 
 # Play nicely with 'thefuck' plugin

aliases/available/general.aliases.bash

@@ -1,12 +1,9 @@
-cite about-alias
+# shellcheck shell=bash
 about-alias 'general aliases'
 
-if ls --color -d . &> /dev/null
-then
-  alias ls="ls --color=auto"
-elif ls -G -d . &> /dev/null
-then
-  alias ls='ls -G'        # Compact view, show colors
+if command ls --color -d . &> /dev/null; then
+	alias ls='ls --color=auto'
+	# BSD `ls` doesn't need an argument (`-G`) when `$CLICOLOR` is set.
 fi
 
 # List directory contents
@@ -15,36 +12,34 @@ alias la='ls -AF'       # Compact view, show hidden
 alias ll='ls -al'
 alias l='ls -a'
 alias l1='ls -1'
+alias lf='ls -F'
 
-alias _="sudo"
+alias _='sudo'
 
 # Shortcuts to edit startup files
-alias vbrc="vim ~/.bashrc"
-alias vbpf="vim ~/.bash_profile"
+alias vbrc='${VISUAL:-vim} ~/.bashrc'
+alias vbpf='${VISUAL:-vim} ~/.bash_profile'
 
 # colored grep
 # Need to check an existing file for a pattern that will be found to ensure
 # that the check works when on an OS that supports the color option
-if grep --color=auto "a" "${BASH_IT}/"*.md &> /dev/null
-then
+if command grep --color=auto "a" "${BASH_IT?}"/*.md &> /dev/null; then
 	alias grep='grep --color=auto'
 fi
 
-if which gshuf &> /dev/null
-then
+if _command_exists gshuf; then
 	alias shuf=gshuf
 fi
 
 alias c='clear'
-alias k='clear'
 alias cls='clear'
 
-alias edit="$EDITOR"
-alias pager="$PAGER"
+alias edit='${EDITOR:-${ALTERNATE_EDITOR:-nano}}'
+alias pager='${PAGER:=less}'
 
 alias q='exit'
 
-alias irc="${IRC_CLIENT:=irc}"
+alias irc='${IRC_CLIENT:=irc}'
 
 # Language aliases
 alias rb='ruby'
@@ -65,8 +60,7 @@ alias -- -='cd -'        # Go back
 alias h='history'
 
 # Tree
-if [ ! -x "$(which tree 2>/dev/null)" ]
-then
+if ! _command_exists tree; then
 	alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'"
 fi
 
@@ -75,16 +69,12 @@ alias md='mkdir -p'
 alias rd='rmdir'
 
 # Shorten extract
-alias xt="extract"
-
-# sudo editors
-alias svim="sudo vim"
-alias snano="sudo nano"
+alias xt='extract'
 
 # Display whatever file is regular file or folder
-catt() {
+function catt() {
 	for i in "$@"; do
-    if [ -d "$i" ]; then
+		if [[ -d "$i" ]]; then
 			ls "$i"
 		else
 			cat "$i"
@@ -98,5 +88,5 @@ catt() {
 # 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
+# shellcheck source-path=SCRIPTDIR
 source "$BASH_IT/aliases/available/bash-it.aliases.bash"

aliases/available/git.aliases.bash

@@ -1,131 +1,193 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'common git abbreviations'
 
-# Aliases
-alias gcl='git clone'
-alias ga='git add'
-alias grm='git rm'
-alias gap='git add -p'
-alias gall='git add -A'
-alias gf='git fetch --all --prune'
-alias gft='git fetch --all --prune --tags'
-alias gfv='git fetch --all --prune --verbose'
-alias gftv='git fetch --all --prune --tags --verbose'
-alias gus='git reset HEAD'
-alias gpristine='git reset --hard && git clean -dfx'
-alias gclean='git clean -fd'
-alias gm="git merge"
-alias gmv='git mv'
 alias g='git'
 alias get='git'
-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'
-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'
-alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'
-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'
+
+# add
+alias ga='git add'
+alias gall='git add -A'
+alias gap='git add -p'
+alias gav='git add -v'
+
+# branch
+alias gb='git branch'
+alias gba='git branch --all'
+alias gbd='git branch -d'
+alias gbD='git branch -D'
+alias gbl='git branch --list'
+alias gbla='git branch --list --all'
+alias gblr='git branch --list --remotes'
+alias gbm='git branch --move'
+alias gbr='git branch --remotes'
+alias gbt='git branch --track'
+alias gdel='git branch -D'
+
+# for-each-ref
+alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC' # FROM https://stackoverflow.com/a/58623139/10362396
+
+# commit
+alias gc='git commit -v'
+alias gca='git commit -v -a'
+alias gcaa='git commit -a --amend -C HEAD' # Add uncommitted and unstaged changes to the last commit
+alias gcam='git commit -v -am'
+alias gcamd='git commit --amend'
+alias gcm='git commit -v -m'
+alias gci='git commit --interactive'
+alias gcsam='git commit -S -am'
+
+# checkout
+alias gcb='git checkout -b'
+alias gco='git checkout'
+alias gcob='git checkout -b'
+alias gcobu='git checkout -b ${USER}/'
+alias gcom='git checkout $(get_default_branch)'
+alias gcpd='git checkout $(get_default_branch); git pull; git branch -D'
+alias gct='git checkout --track'
+
+# clone
+alias gcl='git clone'
+
+# clean
+alias gclean='git clean -fd'
+
+# cherry-pick
+alias gcp='git cherry-pick'
+alias gcpx='git cherry-pick -x'
+
+# diff
 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'
-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'
-# 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'
-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'
-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'
+
+# archive
 alias gexport='git archive --format zip --output'
-alias gdel='git branch -D'
-alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
+
+# fetch
+alias gf='git fetch --all --prune'
+alias gft='git fetch --all --prune --tags'
+alias gftv='git fetch --all --prune --tags --verbose'
+alias gfv='git fetch --all --prune --verbose'
+alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/$(get_default_branch)'
+alias gup='git fetch && git rebase'
+
+# log
+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 ggup='git log --branches --not --remotes --no-walk --decorate --oneline' # FROM https://stackoverflow.com/questions/39220870/in-git-list-names-of-branches-with-unpushed-commits
 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"
-alias gwc="git whatchanged"
-alias gt="git tag"
-alias gta="git tag -a"
-alias gtd="git tag -d"
-alias gtl="git tag -l"
-alias gpatch="git format-patch -1"
-# From http://blogs.atlassian.com/2014/10/advanced-git-aliases/
-# Show commits since last pull
-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 gpf="git push --force"
-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"
-alias gswm="git switch master"
-alias gswc="git switch --create"
-alias gswt="git switch --track"
-# Git home
-alias ghm='cd "$(git rev-parse --show-toplevel)"'
+alias gnew='git log HEAD@{1}..HEAD@{0}' # Show commits since last pull, see http://blogs.atlassian.com/2014/10/advanced-git-aliases/
+alias gwc='git whatchanged'
+
+# ls-files
+alias gu='git ls-files . --exclude-standard --others' # Show untracked files
+alias glsut='gu'
+alias glsum='git diff --name-only --diff-filter=U' # Show unmerged (conflicted) files
+
+# gui
+alias ggui='git gui'
+
+# home
+alias ghm='cd "$(git rev-parse --show-toplevel)"' # Git home
+# appendage to ghm
 if ! _command_exists gh; then
 	alias gh='ghm'
 fi
-# Show untracked files
-alias gu='git ls-files . --exclude-standard --others'
 
-# Git SVN
-alias gsr='git svn rebase'
+# merge
+alias gm='git merge'
+
+# mv
+alias gmv='git mv'
+
+# patch
+alias gpatch='git format-patch -1'
+
+# push
+alias gp='git push'
+alias gpd='git push --delete'
+alias gpf='git push --force'
+alias gpo='git push origin HEAD'
+alias gpom='git push origin $(get_default_branch)'
+alias gpu='git push --set-upstream'
+alias gpunch='git push --force-with-lease'
+alias gpuo='git push --set-upstream origin'
+alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'
+
+# pull
+alias gl='git pull'
+alias glum='git pull upstream $(get_default_branch)'
+alias gpl='git pull'
+alias gpp='git pull && git push'
+alias gpr='git pull --rebase'
+
+# remote
+alias gr='git remote'
+alias gra='git remote add'
+alias grv='git remote -v'
+
+# rm
+alias grm='git rm'
+
+# rebase
+alias grb='git rebase'
+alias grbc='git rebase --continue'
+alias grm='git rebase $(get_default_branch)'
+alias grmi='git rebase $(get_default_branch) -i'
+alias grma='GIT_SEQUENCE_EDITOR=: git rebase  $(get_default_branch) -i --autosquash'
+alias gprom='git fetch origin $(get_default_branch) && git rebase origin/$(get_default_branch) && git update-ref refs/heads/$(get_default_branch) origin/$(get_default_branch)' # Rebase with latest remote
+
+# reset
+alias gus='git reset HEAD'
+alias gpristine='git reset --hard && git clean -dfx'
+
+# status
+alias gs='git status'
+alias gss='git status -s'
+
+# shortlog
+alias gcount='git shortlog -sn'
+alias gsl='git shortlog -sn'
+
+# show
+alias gsh='git show'
+
+# svn
 alias gsd='git svn dcommit'
+alias gsr='git svn rebase' # Git SVN
+
+# stash
+alias gst='git stash'
+alias gstb='git stash branch'
+alias gstd='git stash drop'
+alias gstl='git stash list'
+alias gstp='git stash pop'  # kept due to long-standing usage
+alias gstpo='git stash pop' # recommended for it's symmetry with gstpu (push)
+
+## 'stash push' introduced in git v2.13.2
+alias gstpu='git stash push'
+alias gstpum='git stash push -m'
+
+## 'stash save' deprecated since git v2.16.0, alias is now push
+alias gsts='git stash push'
+alias gstsm='git stash push -m'
+
+# submodules
+alias gsu='git submodule update --init --recursive'
+
+# switch
+# these aliases requires git v2.23+
+alias gsw='git switch'
+alias gswc='git switch --create'
+alias gswm='git switch $(get_default_branch)'
+alias gswt='git switch --track'
+
+# tag
+alias gt='git tag'
+alias gta='git tag -a'
+alias gtd='git tag -d'
+alias gtl='git tag -l'
 
 case $OSTYPE in
 	darwin*)
@@ -135,3 +197,16 @@ case $OSTYPE in
 		alias gtls='git tag -l | sort -V'
 		;;
 esac
+
+# functions
+function gdv() {
+	git diff --ignore-all-space "$@" | vim -R -
+}
+
+function get_default_branch() {
+	if git branch | grep -q '^. main\s*$'; then
+		echo main
+	else
+		echo master
+	fi
+}

aliases/available/gitsvn.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'common git-svn abbreviations'
 
 # Aliases

aliases/available/heroku.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'heroku task abbreviations'
 
 # heroku

aliases/available/hg.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'mercurial abbreviations'
 
 alias hs='hg status'

aliases/available/homebrew-cask.aliases.bash

@@ -1,7 +1,5 @@
-# Some aliases for Homebrew Cask
-
-cite 'about-alias'
-about-alias 'homebrew-cask abbreviations'
+# shellcheck shell=bash
+about-alias 'Some aliases for Homebrew Cask'
 
 alias bcin='brew cask install'
 alias bcrm='brew cask uninstall'

aliases/available/homebrew.aliases.bash

@@ -1,7 +1,5 @@
-# Some aliases for Homebrew
-
-cite 'about-alias'
-about-alias 'homebrew abbreviations'
+# shellcheck shell=bash
+about-alias 'Some aliases for Homebrew'
 
 alias bup='brew update && brew upgrade'
 alias bout='brew outdated'

aliases/available/homesick.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'homesick aliases'
 
 # Aliases
@@ -19,6 +19,5 @@ alias sikpsh="homesick push dotfiles"
 alias sikrc="homesick rc dotfiles"
 alias sikpth="homesick show_path dotfiles"
 alias sikst="homesick status dotfiles"
-alias siktrk="homesick track $1 dotfiles"
 alias sikulnk="homesick unlink dotfiles"
 alias sikv="homesick version"

aliases/available/jitsu.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'jitsu task abbreviations'
 
 # jitsu

aliases/available/kubectl.aliases.bash

@@ -1,12 +1,6 @@
-#!/bin/bash
-#
-# -binaryanomaly
-
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'kubectl aliases'
 
-function _set_pkg_aliases()
-{
 if _command_exists kubectl; then
 	alias kc='kubectl'
 	alias kcgp='kubectl get pods'
@@ -18,8 +12,5 @@ function _set_pkg_aliases()
 	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'
+	alias kcnetshoot='kubectl run netshoot-$(date +%s) --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
 fi
-}
-
-_set_pkg_aliases

aliases/available/laravel.aliases.bash

@@ -1,9 +1,9 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'laravel artisan abbreviations'
 
 # A list of useful laravel aliases
 
-alias laravel="${HOME}/.composer/vendor/bin/laravel"
+alias laravel='${HOME?}/.composer/vendor/bin/laravel'
 # asset
 alias a:apub='php artisan asset:publish'
 

aliases/available/maven.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'maven abbreviations'
 
 alias mci='mvn clean install'

aliases/available/msys2.aliases.bash

@@ -1,6 +1,4 @@
-#!/bin/bash
-
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'MSYS2 aliases'
 
 LS_COMMON="-hG"
@@ -9,7 +7,8 @@ LS_COMMON="$LS_COMMON -I NTUSER.DAT\* -I ntuser.dat\*"
 
 # alias
 # setup the main ls alias if we've established common args
-test -n "$LS_COMMON" && alias ls="command ls $LS_COMMON"
+alias ls='command ls ${LS_COMMON:-}'
 alias ll="ls -l"
 alias la="ls -a"
 alias lal="ll -a"
+alias lf="ls -F"

aliases/available/node.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'the Node.js environment aliases'
 
 # alias to setup nodejs development environment

aliases/available/npm.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'common npm abbreviations'
 
 # Aliases
@@ -22,6 +22,7 @@ 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'
+alias nt='npm test'
 
 # npx
 alias nx='npx'

aliases/available/osx.aliases.bash

@@ -1,26 +1,27 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'osx-specific aliases'
 
 # Desktop Programs
-alias fireworks="open -a '/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app'"
-alias photoshop="open -a '/Applications/Adobe Photoshop CS3/Adobe Photoshop.app'"
-alias preview="open -a '$PREVIEW'"
-alias xcode="open -a '/Applications/XCode.app'"
-alias filemerge="open -a '/Developer/Applications/Utilities/FileMerge.app'"
-alias safari="open -a safari"
-alias firefox="open -a firefox"
-alias chrome="open -a google\ chrome"
-alias chromium="open -a chromium"
-alias dashcode="open -a dashcode"
+alias fireworks='open -a "/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app"'
+alias photoshop='open -a "/Applications/Adobe Photoshop CS3/Adobe Photoshop.app"'
+alias preview='open -a "${PREVIEW?}"'
+alias xcode='open -a "/Applications/XCode.app"'
+alias filemerge='open -a "/Developer/Applications/Utilities/FileMerge.app"'
+alias safari='open -a safari'
+alias firefox='open -a firefox'
+alias chrome='open -a "Google Chrome"'
+alias chromium='open -a chromium'
+alias brave='open -a "Brave Browser"'
+alias dashcode='open -a dashcode'
 alias f='open -a Finder '
 alias fh='open -a Finder .'
 alias textedit='open -a TextEdit'
 alias hex='open -a "Hex Fiend"'
 alias skype='open -a Skype'
 alias mou='open -a Mou'
-alias subl='open -a Sublime\ Text'
+alias subl='open -a "Sublime Text"'
 
-if [ -s /usr/bin/firefox ] ; then
+if [[ -s /usr/bin/firefox ]]; then
 	unalias firefox
 fi
 
@@ -37,19 +38,20 @@ alias whotunes='lsof -r 2 -n -P -F n -c iTunes -a -i TCP@`hostname`:3689'
 alias flush='dscacheutil -flushcache'
 
 # Show/hide hidden files (for Mac OS X Mavericks)
-alias showhidden="defaults write com.apple.finder AppleShowAllFiles TRUE"
-alias hidehidden="defaults write com.apple.finder AppleShowAllFiles FALSE"
+alias showhidden='defaults write com.apple.finder AppleShowAllFiles TRUE'
+alias hidehidden='defaults write com.apple.finder AppleShowAllFiles FALSE'
 
 # From http://apple.stackexchange.com/questions/110343/copy-last-command-in-terminal
-alias copyLastCmd='fc -ln -1 | awk '\''{$1=$1}1'\'' ORS='\'''\'' | pbcopy'
+# shellcheck disable=SC2142 # The quoting confuses `shellcheck`...
+alias copyLastCmd="fc -ln -1 | awk '{\$1=\$1}1' ORS='' | pbcopy"
 
 # Use Finder's Quick Look on a file (^C or space to close)
 alias ql='qlmanage -p 2>/dev/null'
 
 # Mute/Unmute the system volume. Plays nice with all other volume settings.
-alias mute="osascript -e 'set volume output muted true'"
-alias unmute="osascript -e 'set volume output muted false'"
+alias mute='osascript -e "set volume output muted true"'
+alias unmute='osascript -e "set volume output muted false"'
 
 # Pin to the tail of long commands for an audible alert after long processes
 ## curl http://downloads.com/hugefile.zip; lmk
-alias lmk="say 'Process complete.'"
+alias lmk='say "Process complete."'

aliases/available/phoenix.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'phoenix abbreviations'
 
 # Phoenix Commands

aliases/available/puppet.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'puppet aliases'
 
 # Aliases

aliases/available/pyrocms.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'pyrocms abbreviations'
 
 ###

aliases/available/rails.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'rails abbreviations'
 
 # Rails Commands

aliases/available/svn.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'common svn abbreviations'
 
 # Aliases

aliases/available/systemd.aliases.bash

@@ -1,15 +1,22 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'systemd service'
 
 case $OSTYPE in
 	linux*)
+		# Improve aliases by bringing the common root `sc|scd` + `sre` for action + `u` for user
 		alias sc='systemctl'
-	alias scr='systemctl daemon-reload'
 		alias scu='systemctl --user'
-	alias scur='systemctl --user daemon-reload'
+		alias scdr='systemctl daemon-reload'
+		alias scdru='systemctl --user daemon-reload'
+		alias scr='systemctl restart'
+		alias scru='systemctl --user restart'
 		alias sce='systemctl stop'
-	alias scue='systemctl --user stop'
+		alias sceu='systemctl --user stop'
 		alias scs='systemctl start'
-	alias scus='systemctl --user start'
+		alias scsu='systemctl --user start'
+		# Keeping previous aliases for a non-breaking change.
+		alias scue='sceu'
+		alias scus='scsu'
+		alias scur='scdru'
 		;;
 esac

aliases/available/terraform.aliases.bash

@@ -1,10 +1,9 @@
-# Aliases for Terraform and Terragrunt
-
-cite 'about-alias'
-about-alias 'Terraform abbreviations'
+# shellcheck shell=bash
+about-alias 'Aliases for Terraform and Terragrunt'
 
 alias tf='terraform'
+alias tfi='tf init'
 alias tfv='terraform validate'
 alias tfp='terraform plan'
 alias tfa='terraform apply'
-alias tfd='terraform destory'
+alias tfd='terraform destroy'

aliases/available/terragrunt.aliases.bash

@@ -1,7 +1,5 @@
-# Aliases for Terraform and Terragrunt
-
-cite 'about-alias'
-about-alias 'Terragrunt abbreviations'
+# shellcheck shell=bash
+about-alias 'Aliases for Terraform and Terragrunt'
 
 alias tg='terragrunt'
 alias tgv='terragrunt validate'

aliases/available/textmate.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'textmate abbreviations'
 
 case $OSTYPE in

aliases/available/tmux.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'Tmux terminal multiplexer'
 
 alias txl='tmux ls'

aliases/available/todo.txt-cli.aliases.bash

@@ -1,8 +1,8 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'todo.txt-cli abbreviations'
 
-alias tls="$TODO ls"
-alias ta="$TODO a"
-alias trm="$TODO rm"
-alias tdo="$TODO do"
-alias tpri="$TODO pri"
+alias tls='"${TODO?}" ls'
+alias ta='"${TODO?}" a'
+alias trm='"${TODO?}" rm'
+alias tdo='"${TODO?}" do'
+alias tpri='"${TODO?}" pri'

aliases/available/uuidgen.aliases.bash

@@ -1,4 +1,4 @@
-cite 'uuid-alias'
+# shellcheck shell=bash
 about-alias 'uuidgen aliases'
 
 if _command_exists uuid; then # Linux

aliases/available/vagrant.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'vagrant aliases'
 
 # Aliases

aliases/available/vault.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'vault aliases'
 
 # Aliases

aliases/available/vim.aliases.bash

@@ -1,24 +1,14 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'vim abbreviations'
 
-VIM=$(command -v vim)
-GVIM=$(command -v gvim)
-MVIM=$(command -v mvim)
+_command_exists vim || return
 
-if [[ -n $VIM ]]; then
-	alias v='$VIM'
+alias v='vim'
 # open the vim help in fullscreen incorporated from
 # https://stackoverflow.com/a/4687513
-	alias vimh='${VIM} -c ":h | only"'
-fi
+alias vimh='vim -c ":h | only"'
 
 # open vim in new tab is taken from
 # http://stackoverflow.com/questions/936501/let-gvim-always-run-a-single-instancek
-case $OSTYPE in
-	darwin*)
-		[[ -n $MVIM ]] && function mvimt { command mvim --remote-tab-silent "$@" || command mvim "$@"; }
-		;;
-	*)
-		[[ -n $GVIM ]] && function gvimt { command gvim --remote-tab-silent "$@" || command gvim "$@"; }
-		;;
-esac
+_command_exists mvim && function mvimt { command mvim --remote-tab-silent "$@" || command mvim "$@"; }
+_command_exists gvim && function gvimt { command gvim --remote-tab-silent "$@" || command gvim "$@"; }

aliases/available/yarn.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'yarn package manager aliases'
 
 # Aliases

bash_it.sh

@@ -1,155 +1,110 @@
 #!/usr/bin/env bash
+# shellcheck source-path=SCRIPTDIR/lib source-path=SCRIPTDIR/scripts
+# shellcheck disable=SC2034
+#
 # 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
-  export BASH_IT=$BASH
-  BASH="$(bash -c 'echo $BASH')"
-  export BASH
-  BASH_IT_OLD_BASH_SETUP=true
-fi
+: "${BASH_IT:=${BASH_SOURCE%/*}}"
+: "${BASH_IT_CUSTOM:=${BASH_IT}/custom}"
+: "${CUSTOM_THEME_DIR:="${BASH_IT_CUSTOM}/themes"}"
+: "${BASH_IT_BASHRC:=${BASH_SOURCE[${#BASH_SOURCE[@]} - 1]}}"
 
 # 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
-  _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
-
+# shellcheck source-path=SCRIPTDIR/vendor/github.com/erichs/composure
+source "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 # support 'plumbing' metadata
 cite _about _param _example _group _author _version
+cite about-alias about-plugin about-completion
+
+# Declare our end-of-main finishing hook, but don't use `declare`/`typeset`
+_bash_it_library_finalize_hook=()
+
+# We need to load logging module early in order to be able to log
+source "${BASH_IT}/lib/log.bash"
 
 # 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}: "
+for _bash_it_main_file_lib in "${BASH_IT}/lib"/*.bash; do
+	[[ "$_bash_it_main_file_lib" == "$APPEARANCE_LIB" ]] && continue
+	_bash-it-log-prefix-by-path "${_bash_it_main_file_lib}"
 	_log_debug "Loading library file..."
 	# shellcheck disable=SC1090
-    source "$_bash_it_config_file"
-  fi
+	source "$_bash_it_main_file_lib"
+	BASH_IT_LOG_PREFIX="core: main: "
 done
 
-# Load the global "enabled" directory
-# "family" param is empty so that files get sources in glob order
-# shellcheck source=./scripts/reloader.bash
-source "${BASH_IT}/scripts/reloader.bash"
-
-# Load enabled aliases, completion, plugins
-for file_type in "aliases" "plugins" "completion"
-do
-  # shellcheck source=./scripts/reloader.bash
-  source "${BASH_IT}/scripts/reloader.bash" "skip" "$file_type"
+# Load the global "enabled" directory, then enabled aliases, completion, plugins
+# "_bash_it_main_file_type" param is empty so that files get sourced in glob order
+for _bash_it_main_file_type in "" "aliases" "plugins" "completion"; do
+	BASH_IT_LOG_PREFIX="core: reloader: "
+	# shellcheck disable=SC2140
+	source "${BASH_IT}/scripts/reloader.bash" ${_bash_it_main_file_type:+"skip" "$_bash_it_main_file_type"}
+	BASH_IT_LOG_PREFIX="core: main: "
 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"
+# shellcheck source-path=SCRIPTDIR/themes
+if [[ -n "${BASH_IT_THEME:-}" ]]; then
+	_log_debug "Loading theme '${BASH_IT_THEME}'."
 	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: command_duration: "
-  # shellcheck source=./themes/command_duration.theme.bash
-  source "${BASH_IT}/themes/command_duration.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
+	# shellcheck source=SCRIPTDIR/lib/appearance.bash
 	source "$APPEARANCE_LIB"
+	BASH_IT_LOG_PREFIX="core: main: "
 fi
 
-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: "
+for _bash_it_main_file_type in "aliases" "completion" "plugins"; do
+	_bash_it_main_file_custom="${BASH_IT}/${_bash_it_main_file_type}/custom.${_bash_it_main_file_type}.bash"
+	if [[ -s "${_bash_it_main_file_custom}" ]]; then
+		_bash-it-log-prefix-by-path "${_bash_it_main_file_custom}"
 		_log_debug "Loading component..."
 		# shellcheck disable=SC1090
-    source "${BASH_IT}/${file_type}/custom.${file_type}.bash"
+		source "${_bash_it_main_file_custom}"
 	fi
+	BASH_IT_LOG_PREFIX="core: main: "
 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: "
+for _bash_it_main_file_custom in "${BASH_IT_CUSTOM}"/*.bash "${BASH_IT_CUSTOM}"/*/*.bash; do
+	if [[ -s "${_bash_it_main_file_custom}" ]]; then
+		_bash-it-log-prefix-by-path "${_bash_it_main_file_custom}"
 		_log_debug "Loading custom file..."
 		# shellcheck disable=SC1090
-    source "$_bash_it_config_file"
+		source "$_bash_it_main_file_custom"
 	fi
+	BASH_IT_LOG_PREFIX="core: main: "
 done
 
-unset _bash_it_config_file
-if [[ $PROMPT ]]; then
-  export PS1="\[""$PROMPT""\]"
+if [[ -n "${PROMPT:-}" ]]; then
+	PS1="${PROMPT}"
 fi
 
 # Adding Support for other OSes
-PREVIEW="less"
-
-if [ -s /usr/bin/gloobus-preview ]; then
+if _command_exists gloobus-preview; then
 	PREVIEW="gloobus-preview"
-elif [ -s /Applications/Preview.app ]; then
-  # shellcheck disable=SC2034
+elif [[ -d /Applications/Preview.app ]]; then
 	PREVIEW="/Applications/Preview.app"
-fi
-
-# Load all the Jekyll stuff
-
-if [ -e "$HOME/.jekyllconfig" ]
-then
-  # shellcheck disable=SC1090
-  . "$HOME/.jekyllconfig"
+else
+	PREVIEW="less"
 fi
 
 # BASH_IT_RELOAD_LEGACY is set.
-if ! command -v reload &>/dev/null && [ -n "$BASH_IT_RELOAD_LEGACY" ]; then
-  case $OSTYPE in
-    darwin*)
-      alias reload='source ~/.bash_profile'
-      ;;
-    *)
-      alias reload='source ~/.bashrc'
-      ;;
-  esac
+if [[ -n "${BASH_IT_RELOAD_LEGACY:-}" ]] && ! _command_exists reload; then
+	# shellcheck disable=SC2139
+	alias reload="builtin source '${BASH_IT_BASHRC?}'"
 fi
 
-# Disable trap DEBUG on subshells - https://github.com/Bash-it/bash-it/pull/1040
-set +T
+for _bash_it_library_finalize_f in "${_bash_it_library_finalize_hook[@]:-}"; do
+	eval "${_bash_it_library_finalize_f?}" # Use `eval` to achieve the same behavior as `$PROMPT_COMMAND`.
+done
+unset "${!_bash_it_library_finalize_@}" "${!_bash_it_main_file_@}"

clean_files.txt

@@ -1,7 +1,7 @@
 #######################################################################
 # Allow-list of files to be lint-checked by CI
 #
-# Directory Suport
+# Directory Support
 #   Directory references are allowed within the file, ie:
 #
 #       themes/powerline
@@ -16,26 +16,161 @@
 
 # root directories
 #
-docs
+aliases/
+docs/
+hooks/
+scripts/
 
 # root files
 #
 .gitattributes
+bash_it.sh
+clean_files.txt
+install.sh
 lint_clean_files.sh
 
+# completions
+#
+completion/available/apm.completion.bash
+completion/available/awless.completion.bash
+completion/available/awscli.completion.bash
+completion/available/bash-it.completion.bash
+completion/available/brew.completion.bash
+completion/available/cargo.completion.bash
+completion/available/composer.completion.bash
+completion/available/conda.completion.bash
+completion/available/consul.completion.bash
+completion/available/dart.completion.bash
+completion/available/django.completion.bash
+completion/available/dmidecode.completion.bash
+completion/available/docker-machine.completion.bash
+completion/available/docker.completion.bash
+completion/available/dotnet.completion.bash
+completion/available/flutter.completion.bash
+completion/available/gcloud.completion.bash
+completion/available/gem.completion.bash
+completion/available/git.completion.bash
+completion/available/github-cli.completion.bash
+completion/available/go.completion.bash
+completion/available/helm.completion.bash
+completion/available/jboss5.completion.bash
+completion/available/jboss7.completion.bash
+completion/available/jungle.completion.bash
+completion/available/knife.completion.bash
+completion/available/kontena.completion.bash
+completion/available/kubectl.completion.bash
+completion/available/laravel.completion.bash
+completion/available/lerna.completion.bash
+completion/available/minikube.completion.bash
+completion/available/ngrok.completion.bash
+completion/available/notify-send.completion.bash
+completion/available/npm.completion.bash
+completion/available/packer.completion.bash
+completion/available/pip.completion.bash
+completion/available/pip3.completion.bash
+completion/available/pipenv.completion.bash
+completion/available/pipx.completion.bash
+completion/available/rustup.completion.bash
+completion/available/sdkman.completion.bash
+completion/available/system.completion.bash
+completion/available/vault.completion.bash
+completion/available/vuejs.completion.bash
+completion/available/wpscan.completion.bash
+completion/available/yarn.completion.bash
+
+# libraries
+lib/appearance.bash
+lib/colors.bash
+lib/command_duration.bash
+lib/helpers.bash
+lib/history.bash
+lib/log.bash
+lib/preexec.bash
+lib/preview.bash
+lib/search.bash
+lib/utilities.bash
+
+# plugins
+#
+plugins/available/alias-completion.plugin.bash
+plugins/available/autojump.plugin.bash
+plugins/available/base.plugin.bash
+plugins/available/basher.plugin.bash
+plugins/available/battery.plugin.bash
+plugins/available/blesh.plugin.bash
+plugins/available/cmd-returned-notify.plugin.bash
+plugins/available/colors.plugin.bash
+plugins/available/direnv.plugin.bash
+plugins/available/dirs.plugin.bash
+plugins/available/docker-machine.plugin.bash
+plugins/available/gif.plugin.bash
+plugins/available/git-subrepo.plugin.bash
+plugins/available/git.plugin.bash
+plugins/available/go.plugin.bash
+plugins/available/goenv.plugin.bash
+plugins/available/history-eternal.plugin.bash
+plugins/available/history-search.plugin.bash
+plugins/available/history-substring-search.plugin.bash
+plugins/available/history.plugin.bash
+plugins/available/hub.plugin.bash
+plugins/available/java.plugin.bash
+plugins/available/jekyll.plugin.bash
+plugins/available/jump.plugin.bash
+plugins/available/latex.plugin.bash
+plugins/available/less-pretty-cat.plugin.bash
+plugins/available/man.plugin.bash
+plugins/available/nginx.plugin.bash
+plugins/available/node.plugin.bash
+plugins/available/nodenv.plugin.bash
+plugins/available/osx-timemachine.plugin.bash
+plugins/available/osx.plugin.bash
+plugins/available/percol.plugin.bash
+plugins/available/plenv.plugin.bash
+plugins/available/projects.plugin.bash
+plugins/available/proxy.plugin.bash
+plugins/available/pyenv.plugin.bash
+plugins/available/python.plugin.bash
+plugins/available/rbenv.plugin.bash
+plugins/available/ruby.plugin.bash
+plugins/available/textmate.plugin.bash
+plugins/available/todo.plugin.bash
+plugins/available/xterm.plugin.bash
+plugins/available/zoxide.plugin.bash
+
+# tests
+#
+test/completion/aliases.completion.bats
+test/run
+test/test_helper.bash
+
 # themes
 #
 themes/90210
+themes/agnoster
+themes/atomic
+themes/axin
+themes/bakke
+themes/barbuk
+themes/base.theme.bash
+themes/binaryanomaly
+themes/bira
+themes/bobby
+themes/bobby-python
+themes/brainy
+themes/brunton
+themes/candy
+themes/easy
+themes/essential
+themes/githelpers.theme.bash
+themes/modern
+themes/norbu
+themes/oh-my-posh
+themes/p4helpers.theme.bash
+themes/pete
 themes/powerline
+themes/pure
+themes/purity
 
-# completions
+# vendor init files
 #
-completion/available/cargo.completion.bash
-completion/available/knife.completion.bash
-completion/available/packer.completion.bash
-completion/available/pipx.completion.bash
-completion/available/rustup.completion.bash
-completion/available/vault.completion.bash
-
-# aliases
-aliases/available/vim.aliases.bash
+vendor/.gitattributes

completion/available/aliases.completion.bash

@@ -0,0 +1,112 @@
+# shellcheck shell=bash
+about-plugin 'Automatic completion of aliases'
+# Load after all aliases and completions to understand what needs to be completed
+# BASH_IT_LOAD_PRIORITY: 800
+
+# References:
+# http://superuser.com/a/437508/119764
+# http://stackoverflow.com/a/1793178/1228454
+
+# Automatically add completion for all aliases to commands having completion functions
+function _bash-it-component-completion-callback-on-init-aliases() {
+	local namespace="alias_completion"
+	local tmp_file completion_loader alias_name line completions chars
+	local alias_arg_words new_completion compl_func compl_wrapper alias_defn
+
+	# create array of function completion triggers, keeping multi-word triggers together
+	IFS=$'\n' read -d '' -ra completions < <(complete -p)
+	((${#completions[@]} == 0)) && return 0
+
+	completions=("${completions[@]##complete -* * -}") # strip all but last option plus trigger(s)
+	completions=("${completions[@]#complete -}")       # strip anything missed
+	completions=("${completions[@]#? * }")             # strip last option and arg, leaving only trigger(s)
+	completions=("${completions[@]#? }")       # strip anything missed
+	#TODO: this will fail on some completions...
+
+	# create temporary file for wrapper functions and completions
+	tmp_file="$(mktemp -t "${namespace}-${RANDOM}XXXXXX")" || return 1
+
+	IFS=$'\n' read -r completion_loader < <(complete -p -D 2> /dev/null)
+	if [[ "${completion_loader#complete }" =~ '-F'[[:space:]]([[:alnum:]_]+)[[:space:]] ]]; then
+		completion_loader="${BASH_REMATCH[1]}"
+	else
+		completion_loader=""
+	fi
+
+	# read in "<alias> '<aliased command>' '<command args>'" lines from defined aliases
+	# some aliases do have backslashes that needs to be interpreted
+	# shellcheck disable=SC2162
+	while read line; do
+		line="${line#alias -- }"
+		line="${line#alias }"
+		alias_name="${line%%=*}"
+		alias_defn="${line#*=\'}"                 # alias definition
+		alias_defn="${alias_defn%\'}"
+		alias_cmd="${alias_defn%%[[:space:]]*}" # first word of alias
+		if [[ ${alias_defn} == ${alias_cmd} ]]; then
+			alias_args=''
+		else
+			alias_args="${alias_defn#*[[:space:]]}" # everything after first word
+		fi
+
+		# skip aliases to pipes, boolean control structures and other command lists
+		chars=$'|&;()<>\n'
+		if [[ "${alias_defn}" =~ [$chars] ]]; then
+			continue
+		fi
+		# avoid expanding wildcards
+		read -ra alias_arg_words <<< "$alias_args"
+
+		# skip alias if there is no completion function triggered by the aliased command
+		if ! _bash-it-array-contains-element "$alias_cmd" "${completions[@]}"; then
+			if [[ -n "$completion_loader" ]]; then
+				# force loading of completions for the aliased command
+				"${completion_loader:?}" "${alias_cmd}"
+				# 124 means completion loader was successful
+				[[ $? -eq 124 ]] || continue
+				completions+=("$alias_cmd")
+			else
+				continue
+			fi
+		fi
+		new_completion="$(complete -p "$alias_cmd" 2> /dev/null)"
+
+		# create a wrapper inserting the alias arguments if any
+		if [[ -n $alias_args ]]; then
+			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
+				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_arg_words[@]}\" \"\${COMP_WORDS[@]:1}\")
+                        (( COMP_POINT -= \${#COMP_LINE} ))
+                        COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args}
+                        (( COMP_POINT += \${#COMP_LINE} ))
+                        \"$compl_func\" \"$alias_cmd\" \"\$compl_word\" \"\$prec_word\"
+                    }" >> "$tmp_file"
+				new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }"
+			fi
+		fi
+
+		# replace completion trigger by alias
+		if [[ -n $new_completion ]]; then
+			new_completion="${new_completion% *} $alias_name"
+			echo "$new_completion" >> "$tmp_file"
+		fi
+	done < <(alias -p)
+	# shellcheck source=/dev/null
+	source "$tmp_file" && command rm -f "$tmp_file"
+}
+
+_bash-it-component-completion-callback-on-init-aliases

completion/available/apm.completion.bash

@@ -1,77 +1,4 @@
-#!/usr/bin/env bash
-
-# The MIT License (MIT)
-
-# Copyright (c) 2015 Uğur "vigo" Özyılmazel
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# repo: https://github.com/vigo/apm-bash-completion
-
-__apm(){
-    local cur prev options apm_command
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    __apm_get_command
-    if [[ $cur = -* ]]; then
-        options="--color"
-        if [[ -z $apm_command ]]; then
-            options="$options --version --help"
-        fi
-        if [[ $apm_command && $apm_command = publish ]]; then
-            options="--tag --rename"
-        fi
-    else
-        if [[ -z $apm_command || $apm_command = help ]]; then
-            options="help clean config dedupe deinstall delete dev develop docs erase featured home init install link linked links list ln lns login ls open outdated publish rebuild rebuild-module-cache remove rm search show star starred stars test uninstall unlink unpublish unstar update upgrade view"
-        fi
-        if [[ $apm_command && $apm_command = publish ]]; then
-            options="major minor patch build"
-        fi
-        if [[ $apm_command && $apm_command = config ]]; then
-            options="set get delete list edit"
-        fi
-    fi
-    COMPREPLY=($(compgen -W "$options" -- "$cur"))
-}
-__apm_get_command() {
-    local i
-    for ((i=1; i < $COMP_CWORD; ++i)); do
-        local arg=${COMP_WORDS[$i]}
-        case $arg in
-        [^-]*)
-            apm_command=$arg
-            return;;
-        --version)
-            apm_command=-
-            return;;
-        --help)
-            apm_command=help
-            return;;
-        publish)
-            apm_command=publish
-            return;;
-        config)
-            apm_command=config
-            return;;
-        esac
-    done
-}
-complete -F __apm -o bashdefault -o default apm
+# shellcheck shell=bash
+about-completion "apm completion"
+# shellcheck disable=SC1090
+source "${BASH_IT}"/vendor/github.com/vigo/apm-bash-completion/apm

completion/available/awless.completion.bash

@@ -1 +1,5 @@
-[[ -x "$(which awless)" ]] && source <(awless completion bash)
+# shellcheck shell=bash
+if _command_exists awless; then
+	# shellcheck disable=SC1090
+	source <(awless completion bash)
+fi

completion/available/awscli.completion.bash

@@ -1 +1,5 @@
-[[ -x "$(which aws_completer)" ]] && complete -C "$(which aws_completer)" aws
+# shellcheck shell=bash
+
+if _command_exists aws_completer; then
+	complete -C "$(command -v aws_completer)" aws
+fi

completion/available/bash-it.completion.bash

@@ -1,140 +1,95 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
-_bash-it-comp-enable-disable()
-{
-  local enable_disable_args="alias completion plugin"
-  COMPREPLY=( $(compgen -W "${enable_disable_args}" -- ${cur}) )
+function _compreply_candidates() {
+	local IFS=$'\n'
+
+	read -d '' -ra COMPREPLY < <(compgen -W "${candidates[*]}" -- "${cur}")
 }
 
-_bash-it-comp-list-available-not-enabled()
-{
-  subdirectory="$1"
-
-  local available_things
-
-  available_things=$(for f in `compgen -G "${BASH_IT}/$subdirectory/available/*.bash" | sort -d`;
-    do
-      file_entity=$(basename $f)
-
-      typeset enabled_component=$(command ls "${BASH_IT}/$subdirectory/enabled/"{[0-9]*$BASH_IT_LOAD_PRIORITY_SEPARATOR$file_entity,$file_entity} 2>/dev/null | head -1)
-      typeset enabled_component_global=$(command ls "${BASH_IT}/enabled/"[0-9]*$BASH_IT_LOAD_PRIORITY_SEPARATOR$file_entity 2>/dev/null | head -1)
-
-      if [ -z "$enabled_component" ] && [ -z "$enabled_component_global" ]
-      then
-        basename $f | sed -e 's/\(.*\)\..*\.bash/\1/g'
-      fi
-    done)
-
-  COMPREPLY=( $(compgen -W "all ${available_things}" -- ${cur}) )
-}
-
-_bash-it-comp-list-enabled()
-{
-  local subdirectory="$1"
-  local suffix enabled_things
-
-  suffix=$(echo "$subdirectory" | sed -e 's/plugins/plugin/g')
-
-  enabled_things=$(for f in `sort -d <(compgen -G "${BASH_IT}/$subdirectory/enabled/*.${suffix}.bash") <(compgen -G "${BASH_IT}/enabled/*.${suffix}.bash")`;
-    do
-      basename $f | sed -e 's/\(.*\)\..*\.bash/\1/g' | sed -e "s/^[0-9]*---//g"
-    done)
-
-  COMPREPLY=( $(compgen -W "all ${enabled_things}" -- ${cur}) )
-}
-
-_bash-it-comp-list-available()
-{
-  subdirectory="$1"
-
-  local enabled_things
-
-  enabled_things=$(for f in `compgen -G "${BASH_IT}/$subdirectory/available/*.bash" | sort -d`;
-    do
-      basename $f | sed -e 's/\(.*\)\..*\.bash/\1/g'
-    done)
-
-  COMPREPLY=( $(compgen -W "${enabled_things}" -- ${cur}) )
-}
-
-_bash-it-comp()
-{
-  local cur prev opts
+function _bash-it() {
+	local cur prev verb file_type candidates suffix
 	COMPREPLY=()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD - 1]}"
-  chose_opt="${COMP_WORDS[1]}"
-  file_type="${COMP_WORDS[2]}"
-  opts="disable enable help migrate reload restart doctor search show update version"
-  case "${chose_opt}" in
+	verb="${COMP_WORDS[1]}"
+	file_type="${COMP_WORDS[2]:-}"
+	candidates=('disable' 'enable' 'help' 'migrate' 'reload' 'restart' 'preview' 'profile' 'doctor' 'search' 'show' 'update' 'version')
+	case "${verb}" in
 		show)
-      local show_args="aliases completions plugins"
-      COMPREPLY=( $(compgen -W "${show_args}" -- ${cur}) )
-      return 0
+			candidates=('aliases' 'completions' 'plugins')
+			_compreply_candidates
 			;;
 		help)
-      if [ x"${prev}" == x"aliases" ]; then
-        _bash-it-comp-list-available aliases
-        return 0
+			if [[ "${prev}" == "aliases" ]]; then
+				candidates=('all' "$(_bash-it-component-list "${file_type}")")
+				_compreply_candidates
 			else
-        local help_args="aliases completions migrate plugins update"
-        COMPREPLY=( $(compgen -W "${help_args}" -- ${cur}) )
-        return 0
+				candidates=('aliases' 'completions' 'migrate' 'plugins' 'update')
+				_compreply_candidates
 			fi
 			;;
+		profile)
+			case "${file_type}" in
+				load | rm)
+					if [[ "${file_type}" == "$prev" ]]; then
+						candidates=("${BASH_IT}/profiles"/*.bash_it)
+						candidates=("${candidates[@]##*/}")
+						candidates=("${candidates[@]%%.bash_it}")
+
+						_compreply_candidates
+					fi
+					;;
+				save | list) ;;
+				*)
+					candidates=('load' 'save' 'list' 'rm')
+					_compreply_candidates
+					;;
+			esac
+			;;
 		doctor)
-      local doctor_args="errors warnings all"
-      COMPREPLY=( $(compgen -W "${doctor_args}" -- ${cur}) )
-      return 0
+			candidates=('errors' 'warnings' 'all')
+			_compreply_candidates
 			;;
 		update)
-      if [[ ${cur} == -* ]];then
-        local update_args="-s --silent"
+			if [[ "${cur}" == -* ]]; then
+				candidates=('-s' '--silent')
 			else
-        local update_args="stable dev"
+				candidates=('stable' 'dev')
 			fi
-      COMPREPLY=( $(compgen -W "${update_args}" -- ${cur}) )
-      return 0
+			_compreply_candidates
 			;;
-    migrate | reload | search | version)
+		migrate | reload | restart | search | version) ;;
+		preview)
+			_bash-it-preview # completes itself
 			return 0
 			;;
 		enable | disable)
-      if [ x"${chose_opt}" == x"enable" ];then
-        suffix="available-not-enabled"
+			if [[ "${verb}" == "enable" ]]; then
+				suffix="disabled"
 			else
 				suffix="enabled"
 			fi
 			case "${file_type}" in
-        alias)
-            _bash-it-comp-list-${suffix} aliases
-            return 0
-            ;;
-        plugin)
-            _bash-it-comp-list-${suffix} plugins
-            return 0
-            ;;
-        completion)
-            _bash-it-comp-list-${suffix} completion
-            return 0
+				alias | completion | plugin)
+					candidates=('all' "$("_bash-it-component-list-${suffix}" "${file_type}")")
+					_compreply_candidates
 					;;
 				*)
-            _bash-it-comp-enable-disable
-            return 0
+					candidates=('alias' 'completion' 'plugin')
+					_compreply_candidates
 					;;
 			esac
 			;;
+		*)
+			_compreply_candidates
+			;;
 	esac
-
-  COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-
-  return 0
 }
 
 # Activate completion for bash-it and its common misspellings
-complete -F _bash-it-comp bash-it
-complete -F _bash-it-comp bash-ti
-complete -F _bash-it-comp shit
-complete -F _bash-it-comp bashit
-complete -F _bash-it-comp batshit
-complete -F _bash-it-comp bash_it
+complete -F _bash-it bash-it
+complete -F _bash-it bash-ti
+complete -F _bash-it shit
+complete -F _bash-it bashit
+complete -F _bash-it batshit
+complete -F _bash-it bash_it

completion/available/brew.completion.bash

@@ -1,27 +1,30 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "brew completion"
 
 # Load late to make sure `system` completion loads first
 # BASH_IT_LOAD_PRIORITY: 375
 
-if [[ "$(uname -s)" != 'Darwin' ]] ; then
+if [[ "$OSTYPE" != 'darwin'* ]]; then
 	_log_warning "unsupported operating system - only 'Darwin' is supported"
 	return 0
 fi
 
 # Make sure brew is installed
-_command_exists brew || return 0
+_bash_it_homebrew_check || return 0
 
-BREW_PREFIX=${BREW_PREFIX:-$(brew --prefix)}
+if [[ -r "$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d/brew" ]]; then
+	# shellcheck disable=1090,1091
+	source "$BASH_IT_HOMEBREW_PREFIX/etc/bash_completion.d/brew"
 
-if [[ -r "$BREW_PREFIX"/etc/bash_completion.d/brew ]] ; then
-  source "$BREW_PREFIX"/etc/bash_completion.d/brew
+elif [[ -r "$BASH_IT_HOMEBREW_PREFIX/Library/Contributions/brew_bash_completion.sh" ]]; then
+	# shellcheck disable=1090,1091
+	source "$BASH_IT_HOMEBREW_PREFIX/Library/Contributions/brew_bash_completion.sh"
 
-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
+elif [[ -f "$BASH_IT_HOMEBREW_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
+	# shellcheck disable=1090,1091
+	source "$BASH_IT_HOMEBREW_PREFIX/completions/bash/brew"
 fi

completion/available/cargo.completion.bash

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
-
+# shellcheck shell=bash
 # cargo (Rust package manager) completion
 
 if _binary_exists rustup && _binary_exists cargo; then

completion/available/composer.completion.bash

@@ -1,22 +1,16 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "composer completion"
 
-_composer()
-{
-    local cur script coms opts com
+function __composer_completion() {
+	local cur coms opts com words
 	COMPREPLY=()
 	_get_comp_words_by_ref -n : cur words
 
-    # for an alias, get the real script behind it
-    if [[ $(type -t ${words[0]}) == "alias" ]]; then
-        script=$(alias ${words[0]} | sed -E "s/alias ${words[0]}='(.*)'/\1/")
-    else
-        script=${words[0]}
-    fi
-
 	# lookup for command
-    for word in ${words[@]:1}; do
-        if [[ $word != -* ]]; then
-            com=$word
+	for word in "${words[@]:1}"; do
+		if [[ "${word}" != -* ]]; then
+			com="${word}"
 			break
 		fi
 	done
@@ -25,7 +19,7 @@ _composer()
 	if [[ ${cur} == --* ]]; then
 		opts="--help --quiet --verbose --version --ansi --no-ansi --no-interaction --profile --no-plugins --working-dir"
 
-        case "$com" in
+		case "${com}" in
 			about)
 				opts="${opts} "
 				;;
@@ -113,21 +107,23 @@ _composer()
 
 		esac
 
-        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-        __ltrim_colon_completions "$cur"
+		# shellcheck disable=SC2207
+		COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
+		__ltrim_colon_completions "${cur}"
 
-        return 0;
+		return 0
 	fi
 
 	# completing for a command
-    if [[ $cur == $com ]]; then
+	if [[ "${cur}" == "${com}" ]]; then
 		coms="about archive browse clear-cache config create-project depends diagnose dump-autoload exec global help init install licenses list outdated prohibits remove require run-script search self-update show status suggests update validate"
 
-        COMPREPLY=($(compgen -W "${coms}" -- ${cur}))
-        __ltrim_colon_completions "$cur"
+		# shellcheck disable=SC2207
+		COMPREPLY=($(compgen -W "${coms}" -- "${cur}"))
+		__ltrim_colon_completions "${cur}"
 
 		return 0
 	fi
 }
 
-complete -o default -F _composer composer
+complete -o default -F __composer_completion composer

completion/available/conda.completion.bash

@@ -1,4 +1,11 @@
-#!/usr/bin/env bash
-which register-python-argcomplete > /dev/null \
-  && eval "$(register-python-argcomplete conda)" \
-  || echo "Please install argcomplete to use conda completion"
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "conda completion"
+
+if _command_exists conda; then
+	if _command_exists register-python-argcomplete; then
+		eval "$(register-python-argcomplete conda)"
+	else
+		_log_warning "Argcomplete not found. Please run 'conda install argcomplete'"
+	fi
+fi

completion/available/consul.completion.bash

@@ -1,10 +1,7 @@
-# bash completion support for Hashicorp consul
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "Hashicorp consul completion"
 
-CONSUL_BIN=$(command -v consul 2>/dev/null)
-
-if [[ -x "$CONSUL_BIN" ]]
-then
-  complete -C "$CONSUL_BIN" consul
+if _command_exists consul; then
+	complete -C "$(command -v consul)" consul
 fi
-
-unset CONSUL_BIN

completion/available/dart.completion.bash

@@ -0,0 +1,48 @@
+# shellcheck shell=bash
+
+__dart_completion() {
+	# shellcheck disable=SC2155
+	local prev=$(_get_pword)
+	# shellcheck disable=SC2155
+	local curr=$(_get_cword)
+
+	local HELP="--help -h"
+	local VERBOSE="-v --verbose"
+
+	case $prev in
+		analyze)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$HELP --fatal-infos --no-fatal-warnings --fatal-warnings" -- "$curr"))
+			;;
+		compile)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$HELP aot-snapshot exe js jit-snapshot kernel" -- "$curr"))
+			;;
+		create)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$HELP --template -t --no-pub --pub --force" -- "$curr"))
+			;;
+		-t | --template)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "console-simple console-full package-simple web-simple" -- "$curr"))
+			;;
+		format)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$HELP $VERBOSE -o --output --fix -l --line-length" -- "$curr"))
+			;;
+		pub)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$HELP $VERBOSE --version --no-trace --trace --verbosity cache deps downgrade get global logout outdated publish run upgrade uploader version" -- "$curr"))
+			;;
+		run)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$HELP --observe --enable-vm-service --no-pause-isolates-on-exit --no-pause-isolates-on-unhandled-exceptions --no-warn-on-pause-with-no-debugger --pause-isolates-on-exit --pause-isolates-on-unhandled-exceptions --warn-on-pause-with-no-debugger" -- "$curr"))
+			;;
+		dart)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$HELP $VERBOSE --version --enable-analytics --disable-analytics help analyze compile create format pub run test" -- "$curr"))
+			;;
+	esac
+}
+
+complete -F __dart_completion dart

completion/available/defaults.completion.bash

@@ -1,175 +1,5 @@
-# defaults
-# Bash command line completion for defaults
-#
-# Created by Jonathon Mah on 2006-11-08.
-# Copyright 2006 Playhaus. All rights reserved.
-#
-# Version 1.0 (2006-11-08)
+# shellcheck shell=bash
 
-
-_defaults_domains()
-{
-    local cur
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-
-	local domains=$( defaults domains | sed -e 's/, /:/g' | tr : '\n' | sed -e 's/ /\\ /g' | grep -i "^$cur" )
-	local IFS=$'\n'
-	COMPREPLY=( $domains )
-	if [[ $( echo '-app' | grep "^$cur" ) ]]; then
-		COMPREPLY[${#COMPREPLY[@]}]="-app"
+if test -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash"; then
+	source "$_"
 fi
-
-    return 0
-}
-
-
-_defaults()
-{
-	local cur prev host_opts cmds cmd domain keys key_index
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	host_opts='-currentHost -host'
-	cmds='read read-type write rename delete domains find help'
-
-	if [[ $COMP_CWORD -eq 1 ]]; then
-		COMPREPLY=( $( compgen -W "$host_opts $cmds" -- $cur ) )
-		return 0
-	elif [[ $COMP_CWORD -eq 2 ]]; then
-		if [[ "$prev" == "-currentHost" ]]; then
-			COMPREPLY=( $( compgen -W "$cmds" -- $cur ) )
-			return 0
-		elif [[ "$prev" == "-host" ]]; then
-			return 0
-			_known_hosts -a
-		else
-			_defaults_domains
-			return 0
-		fi
-	elif [[ $COMP_CWORD -eq 3 ]]; then
-		if [[ ${COMP_WORDS[1]} == "-host" ]]; then
-			_defaults_domains
-			return 0
-		fi
-    fi
-
-	# Both a domain and command have been specified
-
-	if [[ ${COMP_WORDS[1]} == [${cmds// /|}] ]]; then
-		cmd=${COMP_WORDS[1]}
-		domain=${COMP_WORDS[2]}
-		key_index=3
-		if [[ "$domain" == "-app" ]]; then
-			if [[ $COMP_CWORD -eq 3 ]]; then
-				# Completing application name. Can't help here, sorry
-				return 0
-			fi
-			domain="-app ${COMP_WORDS[3]}"
-			key_index=4
-		fi
-	elif [[ ${COMP_WORDS[2]} == "-currentHost" ]] && [[ ${COMP_WORDS[2]} == [${cmds// /|}] ]]; then
-		cmd=${COMP_WORDS[2]}
-		domain=${COMP_WORDS[3]}
-		key_index=4
-		if [[ "$domain" == "-app" ]]; then
-			if [[ $COMP_CWORD -eq 4 ]]; then
-				# Completing application name. Can't help here, sorry
-				return 0
-			fi
-			domain="-app ${COMP_WORDS[4]}"
-			key_index=5
-		fi
-	elif [[ ${COMP_WORDS[3]} == "-host" ]] && [[ ${COMP_WORDS[3]} == [${cmds// /|}] ]]; then
-		cmd=${COMP_WORDS[3]}
-		domain=${COMP_WORDS[4]}
-		key_index=5
-		if [[ "$domain" == "-app" ]]; then
-			if [[ $COMP_CWORD -eq 5 ]]; then
-				# Completing application name. Can't help here, sorry
-				return 0
-			fi
-			domain="-app ${COMP_WORDS[5]}"
-			key_index=6
-		fi
-	fi
-
-	keys=$( defaults read $domain 2>/dev/null | sed -n -e '/^    [^}) ]/p' | sed -e 's/^    \([^" ]\{1,\}\) = .*$/\1/g' -e 's/^    "\([^"]\{1,\}\)" = .*$/\1/g' | sed -e 's/ /\\ /g' )
-
-	case $cmd in
-	read|read-type)
-		# Complete key
-		local IFS=$'\n'
-		COMPREPLY=( $( echo "$keys" | grep -i "^${cur//\\/\\\\}" ) )
-		;;
-	write)
-		if [[ $key_index -eq $COMP_CWORD ]]; then
-			# Complete key
-			local IFS=$'\n'
-			COMPREPLY=( $( echo "$keys" | grep -i "^${cur//\\/\\\\}" ) )
-		elif [[ $((key_index+1)) -eq $COMP_CWORD ]]; then
-			# Complete value type
-			# Unfortunately ${COMP_WORDS[key_index]} fails on keys with spaces
-			local value_types='-string -data -integer -float -boolean -date -array -array-add -dict -dict-add'
-			local cur_type=$( defaults read-type $domain ${COMP_WORDS[key_index]} 2>/dev/null | sed -e 's/^Type is \(.*\)/-\1/' -e's/dictionary/dict/' | grep "^$cur" )
-			if [[ $cur_type ]]; then
-				COMPREPLY=( $cur_type )
-			else
-				COMPREPLY=( $( compgen -W "$value_types" -- $cur ) )
-			fi
-		elif [[ $((key_index+2)) -eq $COMP_CWORD ]]; then
-			# Complete value
-			# Unfortunately ${COMP_WORDS[key_index]} fails on keys with spaces
-			COMPREPLY=( $( defaults read $domain ${COMP_WORDS[key_index]} 2>/dev/null | grep -i "^${cur//\\/\\\\}" ) )
-		fi
-		;;
-	rename)
-		if [[ $key_index -eq $COMP_CWORD ]] ||
-		   [[ $((key_index+1)) -eq $COMP_CWORD ]]; then
-			# Complete source and destination keys
-			local IFS=$'\n'
-			COMPREPLY=( $( echo "$keys" | grep -i "^${cur//\\/\\\\}" ) )
-		fi
-		;;
-	delete)
-		if [[ $key_index -eq $COMP_CWORD ]]; then
-			# Complete key
-			local IFS=$'\n'
-			COMPREPLY=( $( echo "$keys" | grep -i "^${cur//\\/\\\\}" ) )
-		fi
-		;;
-	esac
-
-    return 0
-}
-
-complete -F _defaults -o default defaults
-
-
-# This file is licensed under the BSD license, as follows:
-#
-# Copyright (c) 2006, Playhaus
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the Playhaus nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# This software is provided by the copyright holders and contributors "as is"
-# and any express or implied warranties, including, but not limited to, the
-# implied warranties of merchantability and fitness for a particular purpose are
-# disclaimed. In no event shall the copyright owner or contributors be liable
-# for any direct, indirect, incidental, special, exemplary, or consequential
-# damages (including, but not limited to, procurement of substitute goods or
-# services; loss of use, data, or profits; or business interruption) however
-# caused and on any theory of liability, whether in contract, strict liability,
-# or tort (including negligence or otherwise) arising in any way out of the use
-# of this software, even if advised of the possibility of such damage.

completion/available/django.completion.bash

@@ -1,101 +1,4 @@
-# #########################################################################
-# This bash script adds tab-completion feature to django-admin.py and
-# manage.py.
-#
-# Testing it out without installing
-# =================================
-#
-# To test out the completion without "installing" this, just run this file
-# directly, like so:
-#
-#     . ~/path/to/django_bash_completion
-#
-# Note: There's a dot ('.') at the beginning of that command.
-#
-# After you do that, tab completion will immediately be made available in your
-# current Bash shell. But it won't be available next time you log in.
-#
-# Installing
-# ==========
-#
-# To install this, point to this file from your .bash_profile, like so:
-#
-#     . ~/path/to/django_bash_completion
-#
-# Do the same in your .bashrc if .bashrc doesn't invoke .bash_profile.
-#
-# Settings will take effect the next time you log in.
-#
-# Uninstalling
-# ============
-#
-# To uninstall, just remove the line from your .bash_profile and .bashrc.
-#
-# This file is licensed under the following license:
-# Copyright (c) Django Software Foundation and individual contributors.
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-
-#     1. Redistributions of source code must retain the above copyright notice,
-#        this list of conditions and the following disclaimer.
-
-#     2. Redistributions in binary form must reproduce the above copyright
-#        notice, this list of conditions and the following disclaimer in the
-#        documentation and/or other materials provided with the distribution.
-
-#     3. Neither the name of Django nor the names of its contributors may be used
-#        to endorse or promote products derived from this software without
-#        specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-_django_completion()
-{
-    COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
-                   COMP_CWORD=$COMP_CWORD \
-	               DJANGO_AUTO_COMPLETE=1 $1 ) )
-}
-complete -F _django_completion -o default django-admin.py manage.py django-admin
-
-_python_django_completion()
-{
-    if [[ ${COMP_CWORD} -ge 2 ]]; then
-        PYTHON_EXE=$( basename -- ${COMP_WORDS[0]} )
-        echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
-        if [[ $? == 0 ]]; then
-            PYTHON_SCRIPT=$( basename -- ${COMP_WORDS[1]} )
-            echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
-            if [[ $? == 0 ]]; then
-                COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
-                               COMP_CWORD=$(( COMP_CWORD-1 )) \
-                               DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
-            fi
-        fi
-    fi
-}
-
-# Support for multiple interpreters.
-unset pythons
-if command -v whereis &>/dev/null; then
-    python_interpreters=$(whereis python | cut -d " " -f 2-)
-    for python in $python_interpreters; do
-        pythons="${pythons} $(basename -- $python)"
-    done
-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
-else
-    pythons=python
-fi
-
-complete -F _python_django_completion -o default $pythons
+# shellcheck shell=bash
+about-completion "django completion"
+# shellcheck disable=SC1090
+source "${BASH_IT}"/vendor/github.com/django/django/extras/django_bash_completion

completion/available/dmidecode.completion.bash

@@ -0,0 +1,22 @@
+# shellcheck shell=bash
+
+function __dmidecode_completion() {
+	# shellcheck disable=SC2155
+	local prev=$(_get_pword)
+	# shellcheck disable=SC2155
+	local curr=$(_get_cword)
+
+	case $prev in
+		-s | --string | -t | --type)
+			OPTS=$(dmidecode "$prev" 2>&1 | grep -E '^ ' | sed 's/ *//g')
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "$OPTS" -- "$curr"))
+			;;
+		dmidecode)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "-d --dev-mem -h --help -q --quiet -s --string -t --type -H --handle -u --dump{,-bin} --from-dump --no-sysfs --oem-string -V --version" -- "$curr"))
+			;;
+	esac
+}
+
+complete -F __dmidecode_completion dmidecode

completion/available/docker-compose.completion.bash

@@ -676,7 +676,7 @@ _docker_compose() {
 	done
 
 	local completions_func=_docker_compose_${command//-/_}
-	declare -F $completions_func >/dev/null && $completions_func
+	_is_function $completions_func && $completions_func
 
 	eval "$previous_extglob_setting"
 	return 0

completion/available/docker-machine.completion.bash

@@ -1,431 +1,3 @@
-#
-# bash completion file for docker-machine commands
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Copyright (c) 2014 Docker, Inc
-
-#
-# This script provides completion of:
-#  - commands and their options
-#  - machine names
-#  - filepaths
-#
-# To enable the completions either:
-#  - place this file in /etc/bash_completion.d
-#  or
-#  - copy this file to e.g. ~/.docker-machine-completion.sh and add the line
-#    below to your .bashrc after bash completion features are loaded
-#    . ~/.docker-machine-completion.sh
-#
-
-# --- helper functions -------------------------------------------------------
-
-_docker_machine_q() {
-    docker-machine 2>/dev/null "$@"
-}
-
-# suppresses trailing whitespace
-_docker_machine_nospace() {
-    # compopt is not available in ancient bash versions (OSX)
-    # so only call it if it's available
-    type compopt &>/dev/null && compopt -o nospace
-}
-
-_docker_machine_machines() {
-    _docker_machine_q ls --format '{{.Name}}' "$@"
-}
-
-_docker_machine_drivers() {
-    local drivers=(
-        amazonec2
-        azure
-        digitalocean
-        exoscale
-        generic
-        google
-        hyperv
-        openstack
-        rackspace
-        softlayer
-        virtualbox
-        vmwarefusion
-        vmwarevcloudair
-        vmwarevsphere
-    )
-    echo "${drivers[@]}"
-}
-
-_docker_machine_value_of_option() {
-    local pattern="$1"
-    for (( i=2; i < ${cword}; ++i)); do
-        if [[ ${words[$i]} =~ ^($pattern)$ ]] ; then
-            echo ${words[$i + 1]}
-            break
-        fi
-    done
-}
-
-# Returns `key` if we are currently completing the value of a map option
-# (`key=value`) which matches the glob passed in as an argument.
-# This function is needed for key-specific argument completions.
-_docker_machine_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"
-}
-
-# Finds the position of the first word that is neither option nor an option's argument.
-# If there are options that require arguments, you need to pass a glob describing
-# those options, e.g. "--option1|-o|--option2".
-# Use this function to restrict completions to exact positions after the options.
-_docker_machine_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
-}
-# --- completion functions ---------------------------------------------------
-
-_docker_machine_active() {
-    case "${prev}" in
-        --timeout|-t)
-            return
-            ;;
-    esac
-
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help --timeout -t" -- "${cur}"))
-    fi
-}
-
-_docker_machine_config() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help --swarm" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_create() {
-    case "${prev}" in
-        --driver|-d)
-            COMPREPLY=($(compgen -W "$(_docker_machine_drivers)" -- "${cur}"))
-            return
-            ;;
-    esac
-
-    # driver specific options are only included in help output if --driver is given,
-    # so we have to pass that option when calling docker-machine to harvest options.
-    local driver="$(_docker_machine_value_of_option '--driver|-d')"
-    local parsed_options="$(_docker_machine_q create ${driver:+--driver $driver} --help | grep '^   -' | sed 's/^   //; s/[^a-z0-9-].*$//')"
-    if [[ ${cur} == -* ]]; then
-        COMPREPLY=($(compgen -W "${parsed_options} -d --help" -- "${cur}"))
-    fi
-}
-
-_docker_machine_env() {
-    case "${prev}" in
-        --shell)
-            COMPREPLY=($(compgen -W "cmd emacs fish powershell tcsh" -- "${cur}"))
-            return
-            ;;
-    esac
-
-    if [[ "${cur}" == -* ]]; then
-	COMPREPLY=($(compgen -W "--help --no-proxy --shell --swarm --unset -u" -- "${cur}"))
-    else
-	COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-# See docker-machine-wrapper.bash for the use command
-_docker_machine_use() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help --swarm --unset" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_inspect() {
-    case "${prev}" in
-        --format|-f)
-            return
-            ;;
-    esac
-
-    if [[ "${cur}" == -* ]]; then
-	COMPREPLY=($(compgen -W "--format -f --help" -- "${cur}"))
-    else
-	COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_ip() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_kill() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_ls() {
-    local key=$(_docker_machine_map_key_of_current_option '--filter')
-    case "$key" in
-        driver)
-            COMPREPLY=($(compgen -W "$(_docker_machine_drivers)" -- "${cur##*=}"))
-            return
-            ;;
-        state)
-            COMPREPLY=($(compgen -W "Error Paused Running Saved Starting Stopped Stopping" -- "${cur##*=}"))
-            return
-            ;;
-    esac
-
-    case "${prev}" in
-        --filter)
-            COMPREPLY=($(compgen -W "driver label name state swarm" -S= -- "${cur}"))
-            _docker_machine_nospace
-            return
-            ;;
-        --format|-f|--timeout|-t)
-            return
-            ;;
-    esac
-
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--filter --format -f --help --quiet -q --timeout -t" -- "${cur}"))
-    fi
-}
-
-_docker_machine_mount() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help --unmount -u" -- "${cur}"))
-    else
-        local pos=$(_docker_machine_pos_first_nonflag)
-        if [ "$cword" -eq "$pos" ]; then
-            # We can't complete remote filesystems. All we can do here is to complete the machine.
-            COMPREPLY=($(compgen -W "$(_docker_machine_machines --filter state=Running)" -S: -- "${cur}"))
-            _docker_machine_nospace
-        elif [ "$cword" -eq "$((pos + 1))" ]; then
-           _filedir -d
-        fi
-    fi
-}
-
-_docker_machine_provision() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines --filter state=Running)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_regenerate_certs() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--client-certs --force -f --help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines --filter state=Running)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_restart() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_rm() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--force -f --help -y" -- "${cur}"))
-    else
-	COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_ssh() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_scp() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--delta -d --help --quiet -q --recursive -r" -- "${cur}"))
-    else
-        _filedir
-        # It would be really nice to ssh to the machine and ls to complete
-        # remote files.
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines | sed 's/$/:/')" -- "${cur}") "${COMPREPLY[@]}")
-    fi
-}
-
-_docker_machine_start() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines --filter state=Stopped)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_status() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_stop() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines --filter state=Running)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_upgrade() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_url() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_version() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "$(_docker_machine_machines)" -- "${cur}"))
-    fi
-}
-
-_docker_machine_help() {
-    if [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "--help" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "${commands[*]}" -- "${cur}"))
-    fi
-}
-
-_docker_machine_docker_machine() {
-    if [[ " ${wants_file[*]} " =~ " ${prev} " ]]; then
-        _filedir
-    elif [[ " ${wants_dir[*]} " =~ " ${prev} " ]]; then
-        _filedir -d
-    elif [[ "${cur}" == -* ]]; then
-        COMPREPLY=($(compgen -W "${flags[*]} ${wants_dir[*]} ${wants_file[*]}" -- "${cur}"))
-    else
-        COMPREPLY=($(compgen -W "${commands[*]}" -- "${cur}"))
-    fi
-}
-
-_docker_machine() {
-    COMPREPLY=()
-    local commands=(active config create env inspect ip kill ls mount provision regenerate-certs restart rm ssh scp start status stop upgrade url version help)
-
-    local flags=(--debug --native-ssh --github-api-token --bugsnag-api-token --help --version)
-    local wants_dir=(--storage-path)
-    local wants_file=(--tls-ca-cert --tls-ca-key --tls-client-cert --tls-client-key)
-
-    # Add the use subcommand, if we have an alias loaded
-    if [[ ${DOCKER_MACHINE_WRAPPED} = true ]]; then
-        commands=("${commands[@]}" use)
-    fi
-
-    local cur prev words cword
-    _get_comp_words_by_ref -n : cur prev words cword
-    local i
-    local command=docker-machine command_pos=0
-
-    for (( i=1; i < ${cword}; ++i)); do
-        local word=${words[i]}
-        if [[ " ${wants_file[*]} ${wants_dir[*]} " =~ " ${word} " ]]; then
-            # skip the next option
-            (( ++i ))
-        elif [[ " ${commands[*]} " =~ " ${word} " ]]; then
-            command=${word}
-            command_pos=$i
-        fi
-    done
-
-    local completion_func=_docker_machine_"${command//-/_}"
-    if declare -F "${completion_func}" > /dev/null; then
-        ${completion_func}
-    fi
-
-    return 0
-}
-
-complete -F _docker_machine docker-machine docker-machine.exe
+# shellcheck shell=bash
+_log_warning '"docker-machine" is now deprecated, and as such the bash completion for it is also deprecated.
+Please disable this completion.'

completion/available/docker.completion.bash

@@ -1,10 +1,12 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "docker completion"
 
 # Make sure docker is installed
 _command_exists docker || return
 
 # Don't handle completion if it's already managed
-complete -p docker &>/dev/null && return
+_completion_exists docker && return
 
 _docker_bash_completion_paths=(
 	# MacOS
@@ -15,6 +17,7 @@ _docker_bash_completion_paths=(
 
 for fn in "${_docker_bash_completion_paths[@]}"; do
 	if [ -r "$fn" ]; then
+		# shellcheck disable=SC1090
 		source "$fn"
 		break
 	fi

completion/available/dotnet.completion.bash

@@ -0,0 +1,14 @@
+# shellcheck shell=bash
+about-completion "bash parameter completion for the dotnet CLI"
+# see https://docs.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete#bash
+
+function _dotnet_bash_complete() {
+	local cur="${COMP_WORDS[COMP_CWORD]}" IFS=$'\n'
+	local candidates
+
+	read -d '' -ra candidates < <(dotnet complete --position "${COMP_POINT}" "${COMP_LINE}" 2> /dev/null)
+
+	read -d '' -ra COMPREPLY < <(compgen -W "${candidates[*]:-}" -- "$cur")
+}
+
+complete -f -F _dotnet_bash_complete dotnet

completion/available/drush.completion.bash

@@ -1,2 +1,2 @@
-_log_error 'Bash completion for "drush" is now deprecated, as it used code with incompatible license.
+_log_warning 'Bash completion for "drush" is now deprecated, as it used code with incompatible license.
 Please disable this completion and use the instructions from "drush" developers instead.'

completion/available/fabric.completion.bash

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 #
 # Bash completion support for Fabric (http://fabfile.org/)
 #
@@ -41,8 +41,8 @@ export FAB_COMPLETION_CACHED_TASKS_FILENAME=".fab_tasks~"
 
 
 # Set command to get time of last file modification as seconds since Epoch
-case `uname` in
-    Darwin|FreeBSD)
+case "$OSTYPE" in
+    'darwin'*|'freebsd'*)
         __FAB_COMPLETION_MTIME_COMMAND="stat -f '%m'"
         ;;
     *)
@@ -91,7 +91,7 @@ function __fab_completion() {
         -*)
             if [[ -z "${__FAB_COMPLETION_LONG_OPT}" ]]; then
                 export __FAB_COMPLETION_LONG_OPT=$(
-                    fab --help | egrep -o "\-\-[A-Za-z_\-]+\=?" | sort -u)
+                    fab --help | grep -E -o "\-\-[A-Za-z_\-]+\=?" | sort -u)
             fi
             opts="${__FAB_COMPLETION_LONG_OPT}"
             ;;
@@ -101,7 +101,7 @@ function __fab_completion() {
         # -*)
         #     if [[ -z "${__FAB_COMPLETION_SHORT_OPT}" ]]; then
         #         export __FAB_COMPLETION_SHORT_OPT=$(
-        #             fab --help | egrep -o "^ +\-[A-Za-z_\]" | sort -u)
+        #             fab --help | grep -E -o "^ +\-[A-Za-z_\]" | sort -u)
         #     fi
         #     opts="${__FAB_COMPLETION_SHORT_OPT}"
         #     ;;

completion/available/flutter.completion.bash

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+# shellcheck shell=bash
 
 if _command_exists flutter; then
 	eval "$(flutter bash-completion)"

completion/available/gcloud.completion.bash

@@ -1,9 +1,14 @@
-#/usr/bin/env bash
-# Bash completion for Google Cloud SDK
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "Google Cloud SDK completion"
 
-if which gcloud >/dev/null 2>&1; then
+if _command_exists gcloud; then
+	# get install path
 	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
+
+	# source all the bash completion file that are available
+	for i in "${GOOGLE_SDK_ROOT}"/*.bash.inc; do
+		# shellcheck disable=SC1090
+		source "$i"
 	done
 fi

completion/available/gem.completion.bash

@@ -1,41 +1,35 @@
-#!/usr/bin/env bash
-# Completion for gem
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "gem completion"
 
-_installcomp() {
-  if [ -z "$REMOTE_GEMS" ]
-  then
-    REMOTE_GEMS=( $(gem list --remote --no-versions | tr '\n' ' ') )
-  fi
-
-  local cur=${COMP_WORDS[COMP_CWORD]}
-  COMPREPLY=( $(compgen -W "${REMOTE_GEMS[*]}" -- $cur) )
-}
-
-_uninstallcomp() {
-  if [ -z "$LOCAL_GEMS" ]
-  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) )
-}
-
-_gem() {
+__gem_completion() {
 	local cur=${COMP_WORDS[COMP_CWORD]}
 	local prev=${COMP_WORDS[COMP_CWORD - 1]}
 	case $prev in
 		install)
-      _installcomp
+			# list the remote gems and add to completion
+			if [ -z "$REMOTE_GEMS" ]; then
+				read -r -a REMOTE_GEMS <<< "$(gem list --remote --no-versions | sed 's/\*\*\* REMOTE GEMS \*\*\*//' | tr '\n' ' ')"
+			fi
+
+			local cur=${COMP_WORDS[COMP_CWORD]}
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "${REMOTE_GEMS[*]}" -- "$cur"))
 			return 0
 			;;
 		uninstall)
-      _uninstallcomp
+			# list all local installed gems and add to completion
+			read -r -a LOCAL_GEMS <<< "$(gem list --no-versions | sed 's/\*\*\* LOCAL GEMS \*\*\*//' | tr '\n' ' ')"
+
+			local cur=${COMP_WORDS[COMP_CWORD]}
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "${LOCAL_GEMS[*]}" -- "$cur"))
 			return 0
 			;;
 	esac
 	local commands=(build cert check cleanup contents dependency environment fetch generate_index help install list lock outdated owner pristine push query rdoc search server sources specification stale uninstall unpack update which)
-  COMPREPLY=( $(compgen -W "${commands[*]}" -- $cur) )
+	# shellcheck disable=SC2207
+	COMPREPLY=($(compgen -W "${commands[*]}" -- "$cur"))
 }
 
-complete -F _gem gem
+complete -F __gem_completion gem

completion/available/git.completion.bash

@@ -1,13 +1,9 @@
-#!/usr/bin/env bash
-
-# 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
+# shellcheck shell=bash
+#
+# Locate and load completions for `git`.
 
 # Make sure git is installed
-_command_exists git || return 0
+_command_exists git || return
 
 # Don't handle completion if it's already managed
 if complete -p git &> /dev/null; then
@@ -15,17 +11,25 @@ if complete -p git &>/dev/null ; then
 	return 0
 fi
 
-_git_bash_completion_found=false
+_git_bash_completion_xcrun_git=
+if _command_exists xcrun; then
+	_git_bash_completion_xcrun_git="$(xcrun --find git)"
+fi
 _git_bash_completion_paths=(
+	# Standard locations
+	"${GIT_EXE%/*}/../share/git-core/git-completion.bash"
+	"${GIT_EXE%/*}/../share/git-core/contrib/completion/git-completion.bash"
+	"${GIT_EXE%/*}/../etc/bash_completion.d/git-completion.bash"
 	# 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'
+	"${_git_bash_completion_xcrun_git%/bin/git}/share/git-core/git-completion.bash"
 )
 
 # Load the first completion file found
+_git_bash_completion_found=false
 for _comp_path in "${_git_bash_completion_paths[@]}"; do
-  if [ -r "$_comp_path" ] ; then
+	if [[ -r "$_comp_path" ]]; then
 		_git_bash_completion_found=true
+		# shellcheck disable=SC1090 # don't follow
 		source "$_comp_path"
 		break
 	fi
@@ -35,5 +39,4 @@ done
 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
-unset _git_bash_completion_found
+unset "${!_git_bash_completion@}"

completion/available/git_flow.completion.bash

@@ -172,6 +172,7 @@ __git_flow_list_hotfixes ()
 }
 
 # temporarily wrap __git_find_on_cmdline() for backwards compatibility
-if [ -z "`type -t __git_find_subcommand`" ]; then
+if ! _command_exists __git_find_subcommand
+then
 	alias __git_find_subcommand=__git_find_on_cmdline
 fi

completion/available/git_flow_avh.completion.bash

@@ -505,6 +505,7 @@ __git_flow_list_branches ()
 }
 
 # alias __git_find_on_cmdline for backwards compatibility
-if [ -z "`type -t __git_find_on_cmdline`" ]; then
+if ! _command_exists __git_find_on_cmdline
+then
 	alias __git_find_on_cmdline=__git_find_subcommand
 fi

completion/available/github-cli.completion.bash

@@ -1,10 +1,9 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 cite "about-completion"
 about-completion "GitHub CLI completion"
 
 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
+	# If gh already completed, stop
+	_completion_exists gh && return
 	eval "$(gh completion --shell=bash)"
 fi

completion/available/go.completion.bash

@@ -1,13 +1,15 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+about-completion "completion for go command using gocomplete"
 
 # bash completion for go tool
 # https://github.com/posener/complete
-# https://pkg.go.dev/github.com/posener/complete?tab=doc
 
-# Install gocomplete:
-# go get -u github.com/posener/complete/gocomplete
-# gocomplete -install
-
-if _command_exists gocomplete && _command_exists go ; then
-  complete -C "${GOBIN}"/gocomplete go
+# Test `go version` because goenv creates shim scripts that will be found in PATH
+# but do not always resolve to a working install.
+if _command_exists go && go version &> /dev/null; then
+	# Same idea here, but no need to test a subcommand
+	if _command_exists gocomplete && gocomplete &> /dev/null; then
+		# finally, apply completion
+		complete -C gocomplete go
+	fi
 fi

completion/available/gradle.completion.bash

@@ -1,3 +1,5 @@
+# shellcheck shell=bash
+
 # Copyright (c) 2017 Eric Wendelin
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -22,17 +24,9 @@
 # Avoid inaccurate completions for subproject tasks
 COMP_WORDBREAKS=$(echo "$COMP_WORDBREAKS" | sed -e 's/://g')
 
-__gradle-set-project-root-dir() {
-    local dir=`pwd`
-    project_root_dir=`pwd`
-    while [[ $dir != '/' ]]; do
-        if [[ -f "$dir/settings.gradle" || -f "$dir/gradlew" ]]; then
-            project_root_dir=$dir
-            return 0
-        fi
-        dir="$(dirname "$dir")"
-    done
-    return 1
+function __gradle-set-project-root-dir() {
+    project_root_dir="$(_bash-it-find-in-ancestor "settings.gradle" "gradlew")"
+    return "$?"
 }
 
 __gradle-init-cache-dir() {
@@ -58,9 +52,9 @@ __gradle-set-cache-name() {
 
 __gradle-set-files-checksum() {
     # Cache MD5 sum of all Gradle scripts and modified timestamps
-    if builtin command -v md5 > /dev/null; then
+    if _command_exists md5; then
         gradle_files_checksum=$(md5 -q -s "$(cat "$cache_dir/$cache_name" | xargs ls -o 2>/dev/null)")
-    elif builtin command -v md5sum > /dev/null; then
+    elif _command_exists md5sum; then
         gradle_files_checksum=$(cat "$cache_dir/$cache_name" | xargs ls -o 2>/dev/null | md5sum | awk '{print $1}')
     else
         echo "Cannot generate completions as neither md5 nor md5sum exist on \$PATH"
@@ -74,7 +68,7 @@ __gradle-generate-script-cache() {
 
     if [[ ! $(find $cache_dir/$cache_name -mmin -$cache_ttl_mins 2>/dev/null) ]]; then
         # Cache all Gradle scripts
-        local gradle_build_scripts=$(find $project_root_dir -type f -name "*.gradle" -o -name "*.gradle.kts" 2>/dev/null | egrep -v "$script_exclude_pattern")
+        local gradle_build_scripts=$(find $project_root_dir -type f -name "*.gradle" -o -name "*.gradle.kts" 2>/dev/null | grep -E -v "$script_exclude_pattern")
         printf "%s\n" "${gradle_build_scripts[@]}" > $cache_dir/$cache_name
     fi
 }

completion/available/helm.completion.bash

@@ -1,8 +1,7 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "helm (Kubernetes Package Manager) completion"
 
-# helm (Kubernetes Package Manager) completion
-
-if command -v helm &>/dev/null
-then
+if _command_exists helm; then
 	eval "$(helm completion bash)"
 fi

completion/available/homesick.completion.bash

@@ -1,2 +1,2 @@
-_log_error 'Bash completion for "homesick" is now deprecated, as it used unlicensed code.
+_log_warning 'Bash completion for "homesick" is now deprecated, as it used unlicensed code.
 Please disable this completion and use the instructions from "homesick" bash completion developers instead.'

completion/available/hub.completion.bash

@@ -23,12 +23,12 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # If there is no git tab completion, but we have the _completion loader try to load it
-if ! declare -F _git > /dev/null && declare -F _completion_loader > /dev/null; then
+if ! _is_function _git && _is_function _completion_loader; then
   _completion_loader git
 fi
 
 # 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
+if _is_function _git && ! _is_function __git_list_all_commands_without_hub; 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/')"
@@ -227,7 +227,7 @@ EOF
       ((c++))
     done
     if [ -z "$name" ]; then
-      repo=$(basename "$(pwd)")
+      repo="$(basename "${PWD}")"
     fi
     case "$prev" in
       -d|-h)

completion/available/jboss5.completion.bash

@@ -0,0 +1,4 @@
+# shellcheck shell=bash
+about-completion "jboss5 completion"
+# shellcheck disable=SC1090
+source "${BASH_IT}"/vendor/github.com/rparree/jboss-bash-completion/jboss5

completion/available/jboss7.completion.bash

@@ -1,160 +1,4 @@
-# Completions for JBoss Application Server 7 (EAP 6)
-# VERSION: 0.6
-# DATE: 2012-10-30
-# rparree-at-edc4it-dot-com
-
-# MIT License
-
-# Copyright (c) 2020 Raphael Parree
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-_serverProfiles(){
-    if [[ $COMP_WORDS == *standalone.sh* ]]
-    then
-      serverdir="../standalone/configuration/"
-    else
-       # 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
-
-    done
-    if [ -d "${serverdir}" ]
-    then
-
-      IFS=$'\n' tmp="$(ls "${serverdir}" | grep xml)"
-        local fls="${tmp[@]// /\ }"
-      unset IFS
-      COMPREPLY=( $(compgen -W "${fls} initial boot last v" -- "$cur" ))
-    fi
-}
-
-_bindingAddress(){
-  # from /etc/bash_completion.d/ssh
-    COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
-    "0.0.0.0 $( PATH="$PATH:/sbin" ifconfig -a | \
-    sed -ne 's/.*addr:\([^[:space:]]*\).*/\1/p' \
-        -ne 's/.*inet[[:space:]]\{1,\}\([^[:space:]]*\).*/\1/p' )" \
-    -- "$cur" ) )
-}
-
-_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
-            local bindings="100 200 300 400 10000 20000 30000 40000"
-            COMPREPLY=( $(compgen -W "${bindings}" -- ${cur}) )
-            return 0
-            ;;
-        -Djboss.default.jgroups.stack=*)
-            cur=${cur#*=}
-            #static list of standard JGroups stacks
-            local stacks="udp udp-async udp-sync tcp tcp-sync"
-            COMPREPLY=( $(compgen -W "${stacks}" -- ${cur}) )
-            return 0
-            ;;
-
-        -Dorg.jboss.ejb3.remoting.IsLocalInterceptor.passByRef=*|-Dcom.sun.management.jmxremote.authenticate=*|-Dcom.sun.management.jmxremote.ssl=*)
-            cur=${cur#*=}
-            local booleans="true false"
-            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
-           return 0
-           ;;
-        --server-config=*|-c=|--host-config=*)
-	   cur=${cur#*=}
-           _serverProfiles
-           return 0
-
-
-    esac
-
-
-    case $prev in
-        -u)
-            # a few from RFC 2365 IPv4 Local Scope ()
-           local addresses="239.255.0.1 239.255.0.2 239.255.0.3"
-            COMPREPLY=( $(compgen -W "${addresses}" -- ${cur}) )
-            return 0
-            ;;
-        -b*)
-            _bindingAddress
-            return 0
-            ;;
-        -c)
-            _serverProfiles
-            return 0
-            ;;
-        *)
-            ;;
-    esac
-    # *** from jboss5  ********************
-    # *** -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"
-       commandsWithEqualSign="${commandsWithEqualSign} --server-config -Djboss.server.base.dir -c"
-    else
-       # assume is domain.sh
-       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" ) )
-    return 0
-
-
-}
-complete -o nospace -F _jboss standalone.sh
-complete -o nospace -F _jboss domain.sh
+# shellcheck shell=bash
+about-completion "jboss7 completion"
+# shellcheck disable=SC1090
+source "${BASH_IT}"/vendor/github.com/rparree/jboss-bash-completion/jboss7

completion/available/jungle.completion.bash

@@ -1 +1,7 @@
-[[ -x "$(which jungle)" ]] && eval "$(_JUNGLE_COMPLETE=source jungle)"
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "jungle(AWS cli tool) completion"
+
+if _command_exists jungle; then
+	eval "$(_JUNGLE_COMPLETE=source jungle)"
+fi

completion/available/knife.completion.bash

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 # Published originally as public domain code at https://github.com/wk8/knife-bash-autocomplete
 
@@ -42,6 +42,7 @@ _KAC_is_file_newer_than() {
 _KAC_regen_cache() {
 	local CACHE_NAME=$1
 	local CACHE_PATH="$_KNIFE_AUTOCOMPLETE_CACHE_DIR/$CACHE_NAME"
+	# shellcheck disable=SC2155
 	local TMP_FILE=$(mktemp "$_KAC_CACHE_TMP_DIR/$CACHE_NAME.XXXX")
 	shift 1
 	# discard the temp file if it's empty AND the previous command didn't exit successfully, but still mark the cache as updated
@@ -54,18 +55,19 @@ _KAC_regen_cache() {
 
 # cached files can't have spaces in their names
 _KAC_get_cache_name_from_command() {
-	echo "${@/ /_SPACE_}"
+	echo "${@// /_SPACE_}"
 }
 
 # the reverse operation from the function above
 _KAC_get_command_from_cache_name() {
-	echo "${@/_SPACE_/ }"
+	echo "${@//_SPACE_/ }"
 }
 
 # 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)
+# shellcheck disable=SC2155
 _KAC_get_and_regen_cache() {
 	# the cache name can't have space in it
 	local CACHE_NAME=$(_KAC_get_cache_name_from_command "$@")
@@ -100,7 +102,7 @@ _KAC_clean_cache() {
 
 # perform a cache cleaning when loading this file
 # 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
+[[ -n "${KNIFE_CACHE_CLEAN}" ]] && _KAC_clean_cache
 
 #####################################
 ### End of cache helper functions ###
@@ -118,7 +120,7 @@ _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
 		CURRENT="$PREVIOUS ${COMP_WORDS[$I]}"
@@ -127,12 +129,13 @@ _KAC_get_current_base_command() {
 		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
+# shellcheck disable=SC2155
 _KAC_get_current_arg_position() {
 	local CURRENT_ARG_POS=$((_KAC_CURRENT_COMMAND_NB_WORDS + 1))
 	local COMPLETE_COMMAND=$(grep -E "^$_KAC_CURRENT_COMMAND" "$_KAC_CACHE_PATH")
@@ -150,10 +153,11 @@ _KAC_get_current_arg_position() {
 _knife() {
 	_KAC_get_and_regen_cache _KAC_knife_commands
 	local RAW_LIST ITEM REGEN_CMD ARG_POSITION
+	# shellcheck disable=SC2034
 	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=$(grep -E "^$_KAC_CURRENT_COMMAND" "$_KAC_CACHE_PATH" | cut -d ' ' -f $ARG_POSITION | uniq)
+	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)

completion/available/kontena.completion.bash

@@ -1 +1,5 @@
-which kontena > /dev/null && . "$( kontena whoami --bash-completion-path )"
+# shellcheck shell=bash
+if _command_exists kontena; then
+	# shellcheck disable=SC1090
+	source "$(kontena whoami --bash-completion-path)"
+fi

completion/available/kubectl.completion.bash

@@ -1,8 +1,7 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "kubectl (Kubernetes CLI) completion"
 
-# kubectl (Kubernetes CLI) completion
-
-if command -v kubectl &>/dev/null
-then
+if _binary_exists kubectl; then
 	eval "$(kubectl completion bash)"
 fi

completion/available/laravel.completion.bash

@@ -1,10 +1,12 @@
-#!/usr/bin/bash
+# shellcheck shell=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")
+_command_exists laravel || return
+
+function __laravel_completion() {
+	local OPTS=('-h' '--help' '-q' '--quiet' '--ansi' '--no-ansi' '-n' '--no-interaction' '-v' '-vv' '-vvv' '--verbose' 'help' 'list' 'new')
+	local _opt_
 	COMPREPLY=()
-        for _opt_ in ${OPTS[@]}; do
+	for _opt_ in "${OPTS[@]}"; do
 		if [[ "$_opt_" == "$2"* ]]; then
 			COMPREPLY+=("$_opt_")
 		fi
@@ -12,4 +14,3 @@ if command -v laravel > /dev/null; then
 }
 
 complete -F __laravel_completion laravel
-fi

completion/available/lerna.completion.bash

@@ -1,6 +1,8 @@
-#!/bin/bash
-# Lerna autocompletion.
-function _lerna_completions() {
+# shellcheck shell=bash
+cite "about-completion"
+about-completion "lerna(javascript project manager tool) completion"
+
+function __lerna_completion() {
 	local cur compls
 
 	# The currently-being-completed word.
@@ -14,6 +16,7 @@ function _lerna_completions() {
 	--version"
 
 	# Tell complete what stuff to show.
+	# shellcheck disable=2207
 	COMPREPLY=($(compgen -W "$compls" -- "$cur"))
 }
-complete -o default -F _lerna_completions lerna
+complete -o default -F __lerna_completion lerna