Skip to content

Commit 4de495a

Browse files
committed
Merge branch 'master' into gaelic-plugins
* master: Add aliases for git worktree Tofu completion rewrite have pre-commit ignore the /vendor, they should be immutable. Fix: __powerline_last_status_prompt to handle unset argument safely completion/dirs completion/export completion/vuejs: `shellcheck` completion/notify-send: `shellcheck` completion/dmidecode: `shellcheck` completions: clear and consistent log messages completions: `shellcheck` completions: add to `clean_files.txt` lib/completion: `_bash-it-completion-helper-necessary()` et al lib/completion
2 parents 0f81621 + 338ace2 commit 4de495a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+374
-201
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44
# fail_fast: true
55
minimum_pre_commit_version: 1.18.1
6-
exclude: "docs/_build/"
6+
exclude: "docs/_build/|vendor/"
77
repos:
88
- repo: https://github.com/pre-commit/pre-commit-hooks
99
rev: v2.3.0

aliases/available/git.aliases.bash

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@ alias gta='git tag -a'
212212
alias gtd='git tag -d'
213213
alias gtl='git tag -l'
214214

215+
#worktree
216+
alias gw='git worktree'
217+
alias gwa='git worktree add'
218+
alias gwl='git worktree list'
219+
alias gwr='git worktree remove'
220+
215221
case $OSTYPE in
216222
darwin*)
217223
alias gtls="git tag -l | gsort -V"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# shellcheck shell=bash
22
about-completion "apm completion"
3-
# shellcheck disable=SC1090
4-
source "${BASH_IT}"/vendor/github.com/vigo/apm-bash-completion/apm
3+
# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/vigo/apm-bash-completion
4+
source "${BASH_IT?}/vendor/github.com/vigo/apm-bash-completion/apm"
Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# shellcheck shell=bash
2-
if _command_exists awless; then
3-
# shellcheck disable=SC1090
4-
source <(awless completion bash)
5-
fi
2+
3+
# Make sure awless is installed
4+
_bash-it-completion-helper-necessary awless || return
5+
6+
# Don't handle completion if it's already managed
7+
_bash-it-completion-helper-sufficient awless || return
8+
9+
# shellcheck disable=SC1090
10+
source <(awless completion bash)
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# shellcheck shell=bash
22

3-
if _command_exists aws_completer; then
4-
complete -C "$(command -v aws_completer)" aws
5-
fi
3+
# Make sure aws is installed
4+
_bash-it-completion-helper-necessary aws aws_completer || return
5+
6+
# Don't handle completion if it's already managed
7+
_bash-it-completion-helper-sufficient aws || return
8+
9+
complete -C aws_completer aws
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# shellcheck shell=bash
2-
# cargo (Rust package manager) completion
2+
about-completion "cargo (Rust package manager) completion"
33

4-
if _binary_exists rustup && _binary_exists cargo; then
5-
eval "$(rustup completions bash cargo)"
6-
fi
4+
# Make sure cargo is installed
5+
_bash-it-completion-helper-necessary rustup cargo || return
6+
7+
# Don't handle completion if it's already managed
8+
_bash-it-completion-helper-sufficient cargo || return
9+
10+
eval "$(rustup completions bash cargo)"

completion/available/conda.completion.bash

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# shellcheck shell=bash
2-
cite "about-completion"
32
about-completion "conda completion"
43

54
if _command_exists conda; then
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# shellcheck shell=bash
2-
cite "about-completion"
32
about-completion "Hashicorp consul completion"
43

5-
if _command_exists consul; then
6-
complete -C "$(command -v consul)" consul
7-
fi
4+
# Make sure consul is installed
5+
_bash-it-completion-helper-necessary consul || return
6+
7+
# Don't handle completion if it's already managed
8+
_bash-it-completion-helper-sufficient consul || return
9+
10+
complete -C consul consul
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# shellcheck shell=bash
2-
_log_warning 'Bash completion for "crystal" is now covered by "system". This completion can be disabled.'
2+
3+
_log_warning 'Bash completion for "crystal" is now covered by "system".'
4+
_disable-completion "crystal"
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# shellcheck shell=bash
22
# shellcheck disable=SC1090
33

4-
if test -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash"; then
5-
source "$_"
4+
if [[ -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash" ]]; then
5+
# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/gaelicWizard/bash-progcomp
6+
source "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash"
67
fi

0 commit comments

Comments
 (0)