Merge remote-tracking branch 'origin/master' into bugfix/wpscan-completions
commit
cc3656e557
|
|
@ -23,7 +23,7 @@ shell_variant = bash
|
||||||
binary_next_line = true # like -bn
|
binary_next_line = true # like -bn
|
||||||
switch_case_indent = true # like -ci
|
switch_case_indent = true # like -ci
|
||||||
space_redirects = true # like -sr
|
space_redirects = true # like -sr
|
||||||
keep_padding = true # like -kp
|
keep_padding = false # like -kp
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|
|
||||||
|
|
@ -28,3 +28,17 @@ repos:
|
||||||
# - id: forbid-crlf
|
# - id: forbid-crlf
|
||||||
- id: remove-crlf
|
- id: remove-crlf
|
||||||
exclude: ".bat$"
|
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
|
||||||
|
entry: ./hooks/dot-bash.sh
|
||||||
|
language: system
|
||||||
|
files: "\\.bash$"
|
||||||
|
types: [file]
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,17 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
cite 'about-alias'
|
cite 'about-alias'
|
||||||
about-alias 'pbcopy and pbpaste shortcuts to linux'
|
about-alias 'xclip shortcuts'
|
||||||
|
|
||||||
case $OSTYPE in
|
alias pbcopy="xclip -selection clipboard"
|
||||||
linux*)
|
alias pbpaste="xclip -selection clipboard -o"
|
||||||
XCLIP=$(command -v xclip)
|
|
||||||
[[ $XCLIP ]] && \
|
|
||||||
alias pbcopy="$XCLIP -selection clipboard" && \
|
|
||||||
alias pbpaste="$XCLIP -selection clipboard -o"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
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:
|
# to use it just install xclip on your distribution and it would work like:
|
||||||
# $ echo "hello" | pbcopy
|
# $ echo "hello" | xcpy
|
||||||
# $ pbpaste
|
# $ xpst
|
||||||
# hello
|
# hello
|
||||||
|
|
||||||
# very useful for things like:
|
# very useful for things like:
|
||||||
# cat ~/.ssh/id_rsa.pub | pbcopy
|
# cat ~/.ssh/id_rsa.pub | xcpy
|
||||||
# have fun!
|
# have fun!
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
|
cite 'about-alias'
|
||||||
|
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
|
||||||
|
|
@ -1,131 +1,186 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
cite 'about-alias'
|
cite 'about-alias'
|
||||||
about-alias 'common git abbreviations'
|
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 g='git'
|
||||||
alias get='git'
|
alias get='git'
|
||||||
alias gs='git status'
|
|
||||||
alias gss='git status -s'
|
# add
|
||||||
alias gsu='git submodule update --init --recursive'
|
alias ga='git add'
|
||||||
alias gl='git pull'
|
alias gall='git add -A'
|
||||||
alias gpl='git pull'
|
alias gap='git add -p'
|
||||||
alias glum='git pull upstream master'
|
|
||||||
alias gpr='git pull --rebase'
|
# branch
|
||||||
alias gpp='git pull && git push'
|
alias gb='git branch'
|
||||||
alias gup='git fetch && git rebase'
|
alias gbD='git branch -D'
|
||||||
alias gp='git push'
|
alias gba='git branch -a'
|
||||||
alias gpd='git push --delete'
|
alias gbd='git branch -d'
|
||||||
alias gpo='git push origin HEAD'
|
alias gbm='git branch -m'
|
||||||
alias gpu='git push --set-upstream'
|
alias gbt='git branch --track'
|
||||||
alias gpuo='git push --set-upstream origin'
|
alias gdel='git branch -D'
|
||||||
alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'
|
|
||||||
alias gpom='git push origin master'
|
# for-each-ref
|
||||||
alias gr='git remote'
|
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
|
||||||
alias grv='git remote -v'
|
|
||||||
alias gra='git remote add'
|
# commit
|
||||||
alias grb='git rebase'
|
alias gc='git commit -v'
|
||||||
alias grm='git rebase master'
|
alias gca='git commit -v -a'
|
||||||
alias grmi='git rebase master -i'
|
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 master'
|
||||||
|
alias gcpd='git checkout master; 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 gd='git diff'
|
||||||
alias gds='git diff --staged'
|
alias gds='git diff --staged'
|
||||||
alias gdt='git difftool'
|
alias gdt='git difftool'
|
||||||
alias gdv='git diff -w "$@" | vim -R -'
|
|
||||||
alias gc='git commit -v'
|
# archive
|
||||||
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'
|
|
||||||
alias gexport='git archive --format zip --output'
|
alias gexport='git archive --format zip --output'
|
||||||
alias gdel='git branch -D'
|
|
||||||
|
# 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/master'
|
alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
|
||||||
|
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 gll='git log --graph --pretty=oneline --abbrev-commit'
|
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 gnew='git log HEAD@{1}..HEAD@{0}' # Show commits since last pull, see http://blogs.atlassian.com/2014/10/advanced-git-aliases/
|
||||||
alias ggf="git log --graph --date=short --pretty=format:'%C(auto)%h %Cgreen%an%Creset %Cblue%cd%Creset %C(auto)%d %s'"
|
alias gwc='git whatchanged'
|
||||||
alias ggs="gg --stat"
|
|
||||||
alias gsh="git show"
|
# ls-files
|
||||||
alias gsl="git shortlog -sn"
|
alias gu='git ls-files . --exclude-standard --others' # Show untracked files
|
||||||
alias gwc="git whatchanged"
|
alias glsut='gu'
|
||||||
alias gt="git tag"
|
alias glsum='git diff --name-only --diff-filter=U' # Show unmerged (conflicted) files
|
||||||
alias gta="git tag -a"
|
|
||||||
alias gtd="git tag -d"
|
# gui
|
||||||
alias gtl="git tag -l"
|
alias ggui='git gui'
|
||||||
alias gpatch="git format-patch -1"
|
|
||||||
# From http://blogs.atlassian.com/2014/10/advanced-git-aliases/
|
# home
|
||||||
# Show commits since last pull
|
alias ghm='cd '\''$(git rev-parse --show-toplevel)'\''' # Git home
|
||||||
alias gnew="git log HEAD@{1}..HEAD@{0}"
|
# appendage to ghm
|
||||||
# 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)"'
|
|
||||||
if ! _command_exists gh; then
|
if ! _command_exists gh; then
|
||||||
alias gh='ghm'
|
alias gh='ghm'
|
||||||
fi
|
fi
|
||||||
# Show untracked files
|
|
||||||
alias gu='git ls-files . --exclude-standard --others'
|
|
||||||
|
|
||||||
# Git SVN
|
# merge
|
||||||
alias gsr='git svn rebase'
|
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 master'
|
||||||
|
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 master'
|
||||||
|
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 grm='git rebase master'
|
||||||
|
alias grmi='git rebase master -i'
|
||||||
|
alias gprom='git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master' # Rebase with latest remote master
|
||||||
|
|
||||||
|
# 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 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 master'
|
||||||
|
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
|
case $OSTYPE in
|
||||||
darwin*)
|
darwin*)
|
||||||
|
|
@ -135,3 +190,8 @@ case $OSTYPE in
|
||||||
alias gtls='git tag -l | sort -V'
|
alias gtls='git tag -l | sort -V'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# functions
|
||||||
|
function gdv() {
|
||||||
|
git diff --ignore-all-space "$@" | vim -R -
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
cite 'about-alias'
|
cite 'about-alias'
|
||||||
about-alias 'vim abbreviations'
|
about-alias 'vim abbreviations'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,18 +17,28 @@
|
||||||
# root directories
|
# root directories
|
||||||
#
|
#
|
||||||
docs
|
docs
|
||||||
|
hooks
|
||||||
|
|
||||||
# root files
|
# root files
|
||||||
#
|
#
|
||||||
.gitattributes
|
.gitattributes
|
||||||
lint_clean_files.sh
|
lint_clean_files.sh
|
||||||
|
|
||||||
|
# plugins
|
||||||
|
#
|
||||||
|
plugins/available/history.plugin.bash
|
||||||
|
plugins/available/history-search.plugin.bash
|
||||||
|
plugins/available/history-substring-search.plugin.bash
|
||||||
|
|
||||||
# themes
|
# themes
|
||||||
#
|
#
|
||||||
themes/agnoster
|
themes/agnoster
|
||||||
themes/90210
|
themes/90210
|
||||||
themes/powerline
|
themes/powerline
|
||||||
themes/barbuk
|
themes/barbuk
|
||||||
|
themes/atomic
|
||||||
|
themes/axin
|
||||||
|
themes/base.theme.bash
|
||||||
|
|
||||||
# plugins
|
# plugins
|
||||||
#
|
#
|
||||||
|
|
@ -42,6 +52,10 @@ completion/available/packer.completion.bash
|
||||||
completion/available/pipx.completion.bash
|
completion/available/pipx.completion.bash
|
||||||
completion/available/rustup.completion.bash
|
completion/available/rustup.completion.bash
|
||||||
completion/available/vault.completion.bash
|
completion/available/vault.completion.bash
|
||||||
|
completion/available/sdkman.completion.bash
|
||||||
|
|
||||||
# aliases
|
# aliases
|
||||||
|
#
|
||||||
|
aliases/available/dnf.aliases.bash
|
||||||
aliases/available/vim.aliases.bash
|
aliases/available/vim.aliases.bash
|
||||||
|
aliases/available/git.aliases.bash
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# cargo (Rust package manager) completion
|
# cargo (Rust package manager) completion
|
||||||
|
|
||||||
if _binary_exists rustup && _binary_exists cargo; then
|
if _binary_exists rustup && _binary_exists cargo; then
|
||||||
|
|
|
||||||
|
|
@ -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
|
# Published originally as public domain code at https://github.com/wk8/knife-bash-autocomplete
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
cite "about-completion"
|
cite "about-completion"
|
||||||
about-completion "packer completion"
|
about-completion "packer completion"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
# pipx completion
|
# pipx completion
|
||||||
|
|
||||||
if _command_exists register-python-argcomplete && _command_exists pipx; then
|
if _command_exists register-python-argcomplete && _command_exists pipx; then
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# rustup (Rust toolchain installer) completion
|
# rustup (Rust toolchain installer) completion
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,45 +1,45 @@
|
||||||
_sdkman_complete()
|
# shellcheck shell=bash
|
||||||
{
|
_sdkman_complete() {
|
||||||
local CANDIDATES
|
local CANDIDATES
|
||||||
local CANDIDATE_VERSIONS
|
local CANDIDATE_VERSIONS
|
||||||
|
|
||||||
COMPREPLY=()
|
COMPREPLY=()
|
||||||
|
|
||||||
if [ $COMP_CWORD -eq 1 ]; then
|
if [ "$COMP_CWORD" -eq 1 ]; then
|
||||||
COMPREPLY=( $(compgen -W "install uninstall rm list ls use default home env current upgrade ug version broadcast help offline selfupdate update flush" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "install uninstall rm list ls use default home env current upgrade ug version broadcast help offline selfupdate update flush" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
elif [ $COMP_CWORD -eq 2 ]; then
|
elif [ "$COMP_CWORD" -eq 2 ]; then
|
||||||
case "${COMP_WORDS[COMP_CWORD - 1]}" in
|
case "${COMP_WORDS[COMP_CWORD - 1]}" in
|
||||||
"install" | "i" | "uninstall" | "rm" | "list" | "ls" | "use" | "u" | "default" | "d" | "home" | "h" | "current" | "c" | "upgrade" | "ug")
|
"install" | "i" | "uninstall" | "rm" | "list" | "ls" | "use" | "u" | "default" | "d" | "home" | "h" | "current" | "c" | "upgrade" | "ug")
|
||||||
CANDIDATES=$(echo "${SDKMAN_CANDIDATES_CSV}" | tr ',' ' ')
|
CANDIDATES=$(echo "${SDKMAN_CANDIDATES_CSV}" | tr ',' ' ')
|
||||||
COMPREPLY=( $(compgen -W "$CANDIDATES" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "$CANDIDATES" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
;;
|
;;
|
||||||
"env")
|
"env")
|
||||||
COMPREPLY=( $(compgen -W "init" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "init" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
;;
|
;;
|
||||||
"offline")
|
"offline")
|
||||||
COMPREPLY=( $(compgen -W "enable disable" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "enable disable" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
;;
|
;;
|
||||||
"selfupdate")
|
"selfupdate")
|
||||||
COMPREPLY=( $(compgen -W "force" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "force" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
;;
|
;;
|
||||||
"flush")
|
"flush")
|
||||||
COMPREPLY=( $(compgen -W "archives tmp broadcast version" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "archives tmp broadcast version" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
;;
|
|
||||||
*)
|
|
||||||
;;
|
;;
|
||||||
|
*) ;;
|
||||||
|
|
||||||
esac
|
esac
|
||||||
elif [ $COMP_CWORD -eq 3 ]; then
|
elif [ "$COMP_CWORD" -eq 3 ]; then
|
||||||
case "${COMP_WORDS[COMP_CWORD - 2]}" in
|
case "${COMP_WORDS[COMP_CWORD - 2]}" in
|
||||||
"uninstall" | "rm" | "use" | "u" | "default" | "d" | "home" | "h")
|
"uninstall" | "rm" | "use" | "u" | "default" | "d" | "home" | "h")
|
||||||
_sdkman_candidate_local_versions ${COMP_WORDS[COMP_CWORD-1]}
|
_sdkman_candidate_local_versions "${COMP_WORDS[COMP_CWORD - 1]}"
|
||||||
COMPREPLY=( $(compgen -W "$CANDIDATE_VERSIONS" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "$CANDIDATE_VERSIONS" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
;;
|
;;
|
||||||
"install" | "i")
|
"install" | "i")
|
||||||
_sdkman_candidate_all_versions ${COMP_WORDS[COMP_CWORD-1]}
|
_sdkman_candidate_all_versions "${COMP_WORDS[COMP_CWORD - 1]}"
|
||||||
COMPREPLY=( $(compgen -W "$CANDIDATE_VERSIONS" -- ${COMP_WORDS[COMP_CWORD]}) )
|
mapfile -t COMPREPLY < <(compgen -W "$CANDIDATE_VERSIONS" -- "${COMP_WORDS[COMP_CWORD]}")
|
||||||
;;
|
|
||||||
*)
|
|
||||||
;;
|
;;
|
||||||
|
*) ;;
|
||||||
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -48,25 +48,36 @@ _sdkman_complete()
|
||||||
|
|
||||||
_sdkman_candidate_local_versions() {
|
_sdkman_candidate_local_versions() {
|
||||||
|
|
||||||
CANDIDATE_VERSIONS=$(__sdkman_cleanup_local_versions $1)
|
CANDIDATE_VERSIONS=$(__sdkman_cleanup_local_versions "$1")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_sdkman_candidate_all_versions() {
|
_sdkman_candidate_all_versions() {
|
||||||
|
|
||||||
CANDIDATE_LOCAL_VERSIONS=$(__sdkman_cleanup_local_versions $1)
|
candidate="$1"
|
||||||
|
CANDIDATE_LOCAL_VERSIONS=$(__sdkman_cleanup_local_versions "$candidate")
|
||||||
if [ "$SDKMAN_OFFLINE_MODE" = "true" ]; then
|
if [ "$SDKMAN_OFFLINE_MODE" = "true" ]; then
|
||||||
CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS
|
CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS
|
||||||
else
|
else
|
||||||
CANDIDATE_ONLINE_VERSIONS="$(__sdkman_list_versions $1 | grep " " | grep "\." | cut -c 62-)"
|
# sdkman has a specific output format for Java candidate since
|
||||||
CANDIDATE_VERSIONS="$(echo $CANDIDATE_ONLINE_VERSIONS $CANDIDATE_LOCAL_VERSIONS | tr ' ' '\n' | sort | uniq -u) "
|
# there are multiple vendors and builds.
|
||||||
|
if [ "$candidate" = "java" ]; then
|
||||||
|
CANDIDATE_ONLINE_VERSIONS="$(__sdkman_list_versions "$candidate" | grep " " | grep "\." | cut -c 62-)"
|
||||||
|
else
|
||||||
|
CANDIDATE_ONLINE_VERSIONS="$(__sdkman_list_versions "$candidate" | grep " " | grep "\." | cut -c 6-)"
|
||||||
|
fi
|
||||||
|
# the last grep is used to filter out sdkman flags, such as:
|
||||||
|
# "+" - local version
|
||||||
|
# "*" - installed
|
||||||
|
# ">" - currently in use
|
||||||
|
CANDIDATE_VERSIONS="$(echo "$CANDIDATE_ONLINE_VERSIONS $CANDIDATE_LOCAL_VERSIONS" | tr ' ' '\n' | grep -v -e '^[[:space:]|\*|\>|\+]*$' | sort | uniq -u) "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
__sdkman_cleanup_local_versions() {
|
__sdkman_cleanup_local_versions() {
|
||||||
|
|
||||||
__sdkman_build_version_csv $1 | tr ',' ' '
|
__sdkman_build_version_csv "$1" | tr ',' ' '
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
cite "about-completion"
|
cite "about-completion"
|
||||||
about-completion "vault completion"
|
about-completion "vault completion"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,48 @@
|
||||||
#!/usr/bin/bash
|
#!/usr/bin/bash
|
||||||
|
|
||||||
if command -v vue > /dev/null; then
|
if _command_exists vue; then
|
||||||
__vuejs_completion() {
|
__vuejs_completion() {
|
||||||
local OPTS=("--version --help create add invoke inspect serve build ui init config upgrade info")
|
local prev=$(_get_pword)
|
||||||
COMPREPLY=()
|
local curr=$(_get_cword)
|
||||||
for _opt_ in ${OPTS[@]}; do
|
|
||||||
if [[ "$_opt_" == "$2"* ]]; then
|
case $prev in
|
||||||
COMPREPLY+=("$_opt_")
|
create)
|
||||||
fi
|
COMPREPLY=($(compgen -W "-p -d -i -m -r -g -n -f -c -x -b -h --help --preset --default --inilinePreset --packageManager --registry --git --no-git --force --merge --clone --proxy --bare --skipGetStarted" -- "$curr"))
|
||||||
done
|
;;
|
||||||
|
add|invoke)
|
||||||
|
COMPREPLY=($(compgen -W "--registry -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
inspect)
|
||||||
|
COMPREPLY=($(compgen -W "-v --help --verbose --mode --rule --plugin --plugins --rules" -- "$curr"))
|
||||||
|
;;
|
||||||
|
serve)
|
||||||
|
COMPREPLY=($(compgen -W "-o -h --help --open -c --copy -p --port" -- "$curr"))
|
||||||
|
;;
|
||||||
|
build)
|
||||||
|
COMPREPLY=($(compgen -W "-t --target -n --name -d --dest -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
ui)
|
||||||
|
COMPREPLY=($(compgen -W "-H --host -p --port -D --dev --quiet --headless -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
init)
|
||||||
|
COMPREPLY=($(compgen -W "-c --clone --offline -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
config)
|
||||||
|
COMPREPLY=($(compgen -W "-g --get -s --set -d --delete -e --edit --json -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
outdated)
|
||||||
|
COMPREPLY=($(compgen -W "--next -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
upgrade)
|
||||||
|
COMPREPLY=($(compgen -W "-t --to -f --from -r --registry --all --next -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
migrate)
|
||||||
|
COMPREPLY=($(compgen -W "-f --from -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
COMPREPLY=($(compgen -W "-h --help -v --version create add invoke inspect serve build ui init config outdated upgrade migrate info" -- "$curr"))
|
||||||
|
;;
|
||||||
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
complete -F __vuejs_completion vue
|
complete -F __vuejs_completion vue
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
exit_code=0
|
||||||
|
for file in "$@"; do
|
||||||
|
# Confirm file is not executable
|
||||||
|
#
|
||||||
|
if [[ -x "${file}" ]]; then
|
||||||
|
echo "Bash include file \`${file}\` should not be executable"
|
||||||
|
exit_code=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Confirm expected schellcheck header
|
||||||
|
#
|
||||||
|
LINE1="$(head -n 1 "${file}")"
|
||||||
|
if [[ "${LINE1}" != "# shellcheck shell=bash" ]]; then
|
||||||
|
echo "Bash include file \`${file}\` has bad/missing shellcheck header"
|
||||||
|
exit_code=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
exit $exit_code
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
exit_code=0
|
||||||
|
for file in "$@"; do
|
||||||
|
# Confirm file is executable
|
||||||
|
#
|
||||||
|
if [[ ! -x "${file}" ]]; then
|
||||||
|
echo "Bash file \`${file}\` is not executable"
|
||||||
|
exit_code=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Confirm expected #! header
|
||||||
|
#
|
||||||
|
LINE1="$(head -n 1 "${file}")"
|
||||||
|
if [[ "${LINE1}" != "#!/usr/bin/env bash" ]]; then
|
||||||
|
echo "Bash file \`${file}\` has bad/missing #! header"
|
||||||
|
exit_code=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
exit $exit_code
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Bash History Handling
|
|
||||||
|
|
||||||
shopt -s histappend # append to bash_history if Terminal.app quits
|
|
||||||
export HISTCONTROL=${HISTCONTROL:-ignorespace:erasedups} # erase duplicates; alternative option: export HISTCONTROL=ignoredups
|
|
||||||
export HISTSIZE=${HISTSIZE:-5000} # resize history size
|
|
||||||
export AUTOFEATURE=${AUTOFEATURE:-true autotest} # Cucumber / Autotest integration
|
|
||||||
|
|
||||||
function rh {
|
|
||||||
history | awk '{a[$2]++}END{for(i in a){print a[i] " " i}}' | sort -rn | head
|
|
||||||
}
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
cite about-plugin
|
cite about-plugin
|
||||||
about-plugin 'initializes basher, the shell package manager'
|
about-plugin 'initializes basher, the shell package manager'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
|
cite about-plugin
|
||||||
|
about-plugin 'search history using the prefix already entered'
|
||||||
|
|
||||||
|
# enter a few characters and press UpArrow/DownArrow
|
||||||
|
# to search backwards/forwards through the history
|
||||||
|
if [[ ${SHELLOPTS} =~ (vi|emacs) ]]; then
|
||||||
|
bind '"\e[A":history-search-backward'
|
||||||
|
bind '"\e[B":history-search-forward'
|
||||||
|
fi
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
|
cite about-plugin
|
||||||
|
about-plugin 'search history using the substring already entered'
|
||||||
|
|
||||||
|
# enter a few characters and press UpArrow/DownArrow
|
||||||
|
# to search backwards/forwards through the history
|
||||||
|
if [[ ${SHELLOPTS} =~ (vi|emacs) ]]; then
|
||||||
|
bind '"\e[A":history-substring-search-backward'
|
||||||
|
bind '"\e[B":history-substring-search-forward'
|
||||||
|
fi
|
||||||
|
|
@ -1,9 +1,39 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
cite about-plugin
|
cite about-plugin
|
||||||
about-plugin 'history manipulation'
|
about-plugin 'improve history handling with sane defaults'
|
||||||
# enter a few characters and press UpArrow/DownArrow
|
|
||||||
# to search backwards/forwards through the history
|
# append to bash_history if Terminal.app quits
|
||||||
if [[ ${SHELLOPTS} =~ (vi|emacs) ]]
|
shopt -s histappend
|
||||||
then
|
|
||||||
bind '"[A":history-search-backward'
|
# erase duplicates; alternative option: export HISTCONTROL=ignoredups
|
||||||
bind '"[B":history-search-forward'
|
export HISTCONTROL=${HISTCONTROL:-ignorespace:erasedups}
|
||||||
|
|
||||||
|
# resize history to 100x the default (500)
|
||||||
|
export HISTSIZE=${HISTSIZE:-50000}
|
||||||
|
|
||||||
|
top-history() {
|
||||||
|
about 'print the name and count of the most commonly run tools'
|
||||||
|
|
||||||
|
if [[ -n $HISTTIMEFORMAT ]]; then
|
||||||
|
# To parse history we need a predictable format, which HISTTIMEFORMAT
|
||||||
|
# gets in the way of. So we unset it and set a trap to guarantee the
|
||||||
|
# user's environment returns to normal even if the pipeline below fails.
|
||||||
|
# shellcheck disable=SC2064
|
||||||
|
trap "export HISTTIMEFORMAT='$HISTTIMEFORMAT'" RETURN
|
||||||
|
unset HISTTIMEFORMAT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
history \
|
||||||
|
| awk '{
|
||||||
|
a[$2]++
|
||||||
|
}END{
|
||||||
|
for(i in a)
|
||||||
|
printf("%s\t%s\n", a[i], i)
|
||||||
|
}' \
|
||||||
|
| sort --reverse --numeric-sort \
|
||||||
|
| head \
|
||||||
|
| column \
|
||||||
|
--table \
|
||||||
|
--table-columns 'Command Count,Command Name' \
|
||||||
|
--output-separator ' | '
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
SCM_THEME_PROMPT_DIRTY=" ${red}✗"
|
SCM_THEME_PROMPT_DIRTY=" ${red}✗"
|
||||||
SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
|
SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
|
||||||
SCM_THEME_PROMPT_PREFIX=" |"
|
SCM_THEME_PROMPT_PREFIX=" |"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
# vim: ft=bash ts=2 sw=2 sts=2
|
# vim: ft=bash ts=2 sw=2 sts=2
|
||||||
#
|
#
|
||||||
# agnoster's Theme - https://gist.github.com/3712874
|
# agnoster's Theme - https://gist.github.com/3712874
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# Atomic Bash Prompt for Bash-it
|
# Atomic Bash Prompt for Bash-it
|
||||||
# By lfelipe base on the theme brainy of MunifTanjim
|
# By lfelipe base on the theme brainy of MunifTanjim
|
||||||
|
|
@ -30,7 +30,7 @@ Face="\342\230\273"
|
||||||
____atomic_top_left_parse() {
|
____atomic_top_left_parse() {
|
||||||
ifs_old="${IFS}"
|
ifs_old="${IFS}"
|
||||||
IFS="|"
|
IFS="|"
|
||||||
args=( $1 )
|
read -r -a args <<< "$@"
|
||||||
IFS="${ifs_old}"
|
IFS="${ifs_old}"
|
||||||
if [ -n "${args[3]}" ]; then
|
if [ -n "${args[3]}" ]; then
|
||||||
_TOP_LEFT+="${args[2]}${args[3]}"
|
_TOP_LEFT+="${args[2]}${args[3]}"
|
||||||
|
|
@ -45,7 +45,7 @@ ____atomic_top_left_parse() {
|
||||||
____atomic_top_right_parse() {
|
____atomic_top_right_parse() {
|
||||||
ifs_old="${IFS}"
|
ifs_old="${IFS}"
|
||||||
IFS="|"
|
IFS="|"
|
||||||
args=( $1 )
|
read -r -a args <<< "$@"
|
||||||
IFS="${ifs_old}"
|
IFS="${ifs_old}"
|
||||||
_TOP_RIGHT+=" "
|
_TOP_RIGHT+=" "
|
||||||
if [ -n "${args[3]}" ]; then
|
if [ -n "${args[3]}" ]; then
|
||||||
|
|
@ -62,7 +62,7 @@ ____atomic_top_right_parse() {
|
||||||
____atomic_bottom_parse() {
|
____atomic_bottom_parse() {
|
||||||
ifs_old="${IFS}"
|
ifs_old="${IFS}"
|
||||||
IFS="|"
|
IFS="|"
|
||||||
args=( $1 )
|
read -r -a args <<< "$@"
|
||||||
IFS="${ifs_old}"
|
IFS="${ifs_old}"
|
||||||
_BOTTOM+="${args[0]}${args[1]}"
|
_BOTTOM+="${args[0]}${args[1]}"
|
||||||
[ ${#args[1]} -gt 0 ] && _BOTTOM+=" "
|
[ ${#args[1]} -gt 0 ] && _BOTTOM+=" "
|
||||||
|
|
@ -147,11 +147,11 @@ ___atomic_prompt_ruby() {
|
||||||
}
|
}
|
||||||
|
|
||||||
___atomic_prompt_todo() {
|
___atomic_prompt_todo() {
|
||||||
[ "${THEME_SHOW_TODO}" != "true" ] ||
|
[ "${THEME_SHOW_TODO}" != "true" ] \
|
||||||
[ -z "$(which todo.sh)" ] && return
|
|| [ -z "$(which todo.sh)" ] && return
|
||||||
color=$bold_white
|
color=$bold_white
|
||||||
box="[|]"
|
box="[|]"
|
||||||
info="t:$(todo.sh ls | egrep "TODO: [0-9]+ of ([0-9]+)" | awk '{ print $4 }' )"
|
info="t:$(todo.sh ls | grep -E "TODO: [0-9]+ of ([0-9]+)" | awk '{ print $4 }')"
|
||||||
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green}" "${box}"
|
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green}" "${box}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -164,9 +164,9 @@ ___atomic_prompt_clock() {
|
||||||
}
|
}
|
||||||
|
|
||||||
___atomic_prompt_battery() {
|
___atomic_prompt_battery() {
|
||||||
! _command_exists battery_percentage ||
|
! _command_exists battery_percentage \
|
||||||
[ "${THEME_SHOW_BATTERY}" != "true" ] ||
|
|| [ "${THEME_SHOW_BATTERY}" != "true" ] \
|
||||||
[ "$(battery_percentage)" = "no" ] && return
|
|| [ "$(battery_percentage)" = "no" ] && return
|
||||||
|
|
||||||
batp=$(battery_percentage)
|
batp=$(battery_percentage)
|
||||||
if [ "$batp" -eq 50 ] || [ "$batp" -gt 50 ]; then
|
if [ "$batp" -eq 50 ] || [ "$batp" -gt 50 ]; then
|
||||||
|
|
@ -208,13 +208,13 @@ ___atomic_prompt_char() {
|
||||||
__atomic_show() {
|
__atomic_show() {
|
||||||
typeset _seg=${1:-}
|
typeset _seg=${1:-}
|
||||||
shift
|
shift
|
||||||
export THEME_SHOW_${_seg}=true
|
export "THEME_SHOW_${_seg}"=true
|
||||||
}
|
}
|
||||||
|
|
||||||
__atomic_hide() {
|
__atomic_hide() {
|
||||||
typeset _seg=${1:-}
|
typeset _seg=${1:-}
|
||||||
shift
|
shift
|
||||||
export THEME_SHOW_${_seg}=false
|
export "THEME_SHOW_${_seg}"=false
|
||||||
}
|
}
|
||||||
|
|
||||||
_atomic_completion() {
|
_atomic_completion() {
|
||||||
|
|
@ -226,16 +226,16 @@ _atomic_completion() {
|
||||||
segments="battery clock exitcode python ruby scm sudo todo"
|
segments="battery clock exitcode python ruby scm sudo todo"
|
||||||
case "${_action}" in
|
case "${_action}" in
|
||||||
show)
|
show)
|
||||||
COMPREPLY=( $(compgen -W "${segments}" -- "${cur}") )
|
read -r -a COMPREPLY <<< "$(compgen -W "${segments}" -- "${cur}")"
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
hide)
|
hide)
|
||||||
COMPREPLY=( $(compgen -W "${segments}" -- "${cur}") )
|
read -r -a COMPREPLY <<< "$(compgen -W "${segments}" -- "${cur}")"
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
COMPREPLY=( $(compgen -W "${actions}" -- "${cur}") )
|
read -r -a COMPREPLY <<< "$(compgen -W "${actions}" -- "${cur}")"
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -246,9 +246,11 @@ atomic() {
|
||||||
typeset func
|
typeset func
|
||||||
case $action in
|
case $action in
|
||||||
show)
|
show)
|
||||||
func=__atomic_show;;
|
func=__atomic_show
|
||||||
|
;;
|
||||||
hide)
|
hide)
|
||||||
func=__atomic_hide;;
|
func=__atomic_hide
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
for seg in ${segs}; do
|
for seg in ${segs}; do
|
||||||
seg=$(printf "%s" "${seg}" | tr '[:lower:]' '[:upper:]')
|
seg=$(printf "%s" "${seg}" | tr '[:lower:]' '[:upper:]')
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# Axin Bash Prompt, inspired by theme "Sexy" and "Bobby"
|
# Axin Bash Prompt, inspired by theme "Sexy" and "Bobby"
|
||||||
# thanks to them
|
# thanks to them
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
# shellcheck disable=2034,2154
|
|
||||||
|
|
||||||
# Theme custom glyphs
|
# Theme custom glyphs
|
||||||
SCM_GIT_CHAR_GITLAB=${BARBUK_GITLAB_CHAR:=' '}
|
SCM_GIT_CHAR_GITLAB=${BARBUK_GITLAB_CHAR:=' '}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
CLOCK_CHAR_THEME_PROMPT_PREFIX=''
|
CLOCK_CHAR_THEME_PROMPT_PREFIX=''
|
||||||
CLOCK_CHAR_THEME_PROMPT_SUFFIX=''
|
CLOCK_CHAR_THEME_PROMPT_SUFFIX=''
|
||||||
|
|
@ -100,25 +100,39 @@ if [[ -x "$SVN_EXE" ]] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
function scm {
|
function scm {
|
||||||
if [[ "$SCM_CHECK" = false ]]; then SCM=$SCM_NONE
|
if [[ "$SCM_CHECK" = false ]]; then
|
||||||
elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then SCM=$SCM_GIT
|
SCM=$SCM_NONE
|
||||||
elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then SCM=$SCM_GIT
|
elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then
|
||||||
elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then SCM=$SCM_P4
|
SCM=$SCM_GIT
|
||||||
elif [[ -d .hg ]] && [[ -x "$HG_EXE" ]]; then SCM=$SCM_HG
|
elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then
|
||||||
elif [[ -x "$HG_EXE" ]] && [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG
|
SCM=$SCM_GIT
|
||||||
elif [[ -d .svn ]] && [[ -x "$SVN_EXE" ]]; then SCM=$SCM_SVN
|
elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then
|
||||||
elif [[ -x "$SVN_EXE" ]] && [[ -n "$(svn info --show-item wc-root 2>/dev/null)" ]]; then SCM=$SCM_SVN
|
SCM=$SCM_P4
|
||||||
else SCM=$SCM_NONE
|
elif [[ -d .hg ]] && [[ -x "$HG_EXE" ]]; then
|
||||||
|
SCM=$SCM_HG
|
||||||
|
elif [[ -x "$HG_EXE" ]] && [[ -n "$(hg root 2> /dev/null)" ]]; then
|
||||||
|
SCM=$SCM_HG
|
||||||
|
elif [[ -d .svn ]] && [[ -x "$SVN_EXE" ]]; then
|
||||||
|
SCM=$SCM_SVN
|
||||||
|
elif [[ -x "$SVN_EXE" ]] && [[ -n "$(svn info --show-item wc-root 2> /dev/null)" ]]; then
|
||||||
|
SCM=$SCM_SVN
|
||||||
|
else
|
||||||
|
SCM=$SCM_NONE
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_prompt_char {
|
function scm_prompt_char {
|
||||||
if [[ -z $SCM ]]; then scm; fi
|
if [[ -z $SCM ]]; then scm; fi
|
||||||
if [[ $SCM == $SCM_GIT ]]; then SCM_CHAR=$SCM_GIT_CHAR
|
if [[ $SCM == "$SCM_GIT" ]]; then
|
||||||
elif [[ $SCM == $SCM_P4 ]]; then SCM_CHAR=$SCM_P4_CHAR
|
SCM_CHAR=$SCM_GIT_CHAR
|
||||||
elif [[ $SCM == $SCM_HG ]]; then SCM_CHAR=$SCM_HG_CHAR
|
elif [[ $SCM == "$SCM_P4" ]]; then
|
||||||
elif [[ $SCM == $SCM_SVN ]]; then SCM_CHAR=$SCM_SVN_CHAR
|
SCM_CHAR=$SCM_P4_CHAR
|
||||||
else SCM_CHAR=$SCM_NONE_CHAR
|
elif [[ $SCM == "$SCM_HG" ]]; then
|
||||||
|
SCM_CHAR=$SCM_HG_CHAR
|
||||||
|
elif [[ $SCM == "$SCM_SVN" ]]; then
|
||||||
|
SCM_CHAR=$SCM_SVN_CHAR
|
||||||
|
else
|
||||||
|
SCM_CHAR=$SCM_NONE_CHAR
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,10 +141,10 @@ function scm_prompt_vars {
|
||||||
scm_prompt_char
|
scm_prompt_char
|
||||||
SCM_DIRTY=0
|
SCM_DIRTY=0
|
||||||
SCM_STATE=''
|
SCM_STATE=''
|
||||||
[[ $SCM == $SCM_GIT ]] && git_prompt_vars && return
|
[[ $SCM == "$SCM_GIT" ]] && git_prompt_vars && return
|
||||||
[[ $SCM == $SCM_P4 ]] && p4_prompt_vars && return
|
[[ $SCM == "$SCM_P4" ]] && p4_prompt_vars && return
|
||||||
[[ $SCM == $SCM_HG ]] && hg_prompt_vars && return
|
[[ $SCM == "$SCM_HG" ]] && hg_prompt_vars && return
|
||||||
[[ $SCM == $SCM_SVN ]] && svn_prompt_vars && return
|
[[ $SCM == "$SCM_SVN" ]] && svn_prompt_vars && return
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_prompt_info {
|
function scm_prompt_info {
|
||||||
|
|
@ -149,7 +163,7 @@ function scm_prompt_info_common {
|
||||||
SCM_DIRTY=0
|
SCM_DIRTY=0
|
||||||
SCM_STATE=''
|
SCM_STATE=''
|
||||||
|
|
||||||
if [[ ${SCM} == ${SCM_GIT} ]]; then
|
if [[ ${SCM} == "${SCM_GIT}" ]]; then
|
||||||
if [[ ${SCM_GIT_SHOW_MINIMAL_INFO} == true ]]; then
|
if [[ ${SCM_GIT_SHOW_MINIMAL_INFO} == true ]]; then
|
||||||
# user requests minimal git status information
|
# user requests minimal git status information
|
||||||
git_prompt_minimal_info
|
git_prompt_minimal_info
|
||||||
|
|
@ -161,9 +175,9 @@ function scm_prompt_info_common {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO: consider adding minimal status information for hg and svn
|
# TODO: consider adding minimal status information for hg and svn
|
||||||
{ [[ ${SCM} == ${SCM_P4} ]] && p4_prompt_info && return; } || true
|
{ [[ ${SCM} == "${SCM_P4}" ]] && p4_prompt_info && return; } || true
|
||||||
{ [[ ${SCM} == ${SCM_HG} ]] && hg_prompt_info && return; } || true
|
{ [[ ${SCM} == "${SCM_HG}" ]] && hg_prompt_info && return; } || true
|
||||||
{ [[ ${SCM} == ${SCM_SVN} ]] && svn_prompt_info && return; } || true
|
{ [[ ${SCM} == "${SCM_SVN}" ]] && svn_prompt_info && return; } || true
|
||||||
}
|
}
|
||||||
|
|
||||||
function terraform_workspace_prompt {
|
function terraform_workspace_prompt {
|
||||||
|
|
@ -193,8 +207,10 @@ function git_prompt_minimal_info {
|
||||||
}
|
}
|
||||||
|
|
||||||
function git_prompt_vars {
|
function git_prompt_vars {
|
||||||
if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatus
|
if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then
|
||||||
SCM_GIT_GITSTATUS_RAN=true # use this in githelpers and below to choose gitstatus output
|
# we can use faster gitstatus
|
||||||
|
# use this variable in githelpers and below to choose gitstatus output
|
||||||
|
SCM_GIT_GITSTATUS_RAN=true
|
||||||
else
|
else
|
||||||
SCM_GIT_GITSTATUS_RAN=false
|
SCM_GIT_GITSTATUS_RAN=false
|
||||||
fi
|
fi
|
||||||
|
|
@ -318,7 +334,7 @@ function get_hg_root {
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CURRENT_DIR=$(dirname $CURRENT_DIR)
|
CURRENT_DIR=$(dirname "$CURRENT_DIR")
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -375,8 +391,8 @@ function rvm_version_prompt {
|
||||||
function rbenv_version_prompt {
|
function rbenv_version_prompt {
|
||||||
if which rbenv &> /dev/null; then
|
if which rbenv &> /dev/null; then
|
||||||
rbenv=$(rbenv version-name) || return
|
rbenv=$(rbenv version-name) || return
|
||||||
$(rbenv commands | grep -q gemset) && gemset=$(rbenv gemset active 2> /dev/null) && rbenv="$rbenv@${gemset%% *}"
|
rbenv commands | grep -q gemset && gemset=$(rbenv gemset active 2> /dev/null) && rbenv="$rbenv@${gemset%% *}"
|
||||||
if [ $rbenv != "system" ]; then
|
if [ "$rbenv" != "system" ]; then
|
||||||
echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
|
echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
@ -396,7 +412,7 @@ function chruby_version_prompt {
|
||||||
|
|
||||||
ruby_version=$(ruby --version | awk '{print $1, $2;}') || return
|
ruby_version=$(ruby --version | awk '{print $1, $2;}') || return
|
||||||
|
|
||||||
if [[ ! $(chruby | grep '\*') ]]; then
|
if ! chruby | grep -q '\*'; then
|
||||||
ruby_version="${ruby_version} (system)"
|
ruby_version="${ruby_version} (system)"
|
||||||
fi
|
fi
|
||||||
echo -e "${CHRUBY_THEME_PROMPT_PREFIX}${ruby_version}${CHRUBY_THEME_PROMPT_SUFFIX}"
|
echo -e "${CHRUBY_THEME_PROMPT_PREFIX}${ruby_version}${CHRUBY_THEME_PROMPT_SUFFIX}"
|
||||||
|
|
@ -415,7 +431,7 @@ function k8s_context_prompt {
|
||||||
|
|
||||||
function virtualenv_prompt {
|
function virtualenv_prompt {
|
||||||
if [[ -n "$VIRTUAL_ENV" ]]; then
|
if [[ -n "$VIRTUAL_ENV" ]]; then
|
||||||
virtualenv=`basename "$VIRTUAL_ENV"`
|
virtualenv=$(basename "$VIRTUAL_ENV")
|
||||||
echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX"
|
echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
@ -439,7 +455,7 @@ function git_user_info {
|
||||||
# support two or more initials, set by 'git pair' plugin
|
# support two or more initials, set by 'git pair' plugin
|
||||||
SCM_CURRENT_USER=$(git config user.initials | sed 's% %+%')
|
SCM_CURRENT_USER=$(git config user.initials | sed 's% %+%')
|
||||||
# if `user.initials` weren't set, attempt to extract initials from `user.name`
|
# if `user.initials` weren't set, attempt to extract initials from `user.name`
|
||||||
[[ -z "${SCM_CURRENT_USER}" ]] && SCM_CURRENT_USER=$(printf "%s" $(for word in $(git config user.name | PERLIO=:utf8 perl -pe '$_=lc'); do printf "%s" "${word:0:1}"; done))
|
[[ -z "${SCM_CURRENT_USER}" ]] && SCM_CURRENT_USER=$(printf "%s" "$(for word in $(git config user.name | PERLIO=:utf8 perl -pe '$_=lc'); do printf "%s" "${word:0:1}"; done)")
|
||||||
[[ -n "${SCM_CURRENT_USER}" ]] && printf "%s" "$SCM_THEME_CURRENT_USER_PREFFIX$SCM_CURRENT_USER$SCM_THEME_CURRENT_USER_SUFFIX"
|
[[ -n "${SCM_CURRENT_USER}" ]] && printf "%s" "$SCM_THEME_CURRENT_USER_PREFFIX$SCM_CURRENT_USER$SCM_THEME_CURRENT_USER_SUFFIX"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -456,7 +472,7 @@ function clock_char {
|
||||||
function clock_prompt {
|
function clock_prompt {
|
||||||
CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$normal"}
|
CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$normal"}
|
||||||
CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"}
|
CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"}
|
||||||
[ -z $THEME_SHOW_CLOCK ] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-"true"}
|
[ -z "$THEME_SHOW_CLOCK" ] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-"true"}
|
||||||
SHOW_CLOCK=$THEME_SHOW_CLOCK
|
SHOW_CLOCK=$THEME_SHOW_CLOCK
|
||||||
|
|
||||||
if [[ "${SHOW_CLOCK}" = "true" ]]; then
|
if [[ "${SHOW_CLOCK}" = "true" ]]; then
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
# Define this here so it can be used by all of the Powerline themes
|
# Define this here so it can be used by all of the Powerline themes
|
||||||
THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true}
|
THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# shellcheck source=../../themes/powerline/powerline.base.bash
|
# shellcheck source=../../themes/powerline/powerline.base.bash
|
||||||
. "$BASH_IT/themes/powerline/powerline.base.bash"
|
. "$BASH_IT/themes/powerline/powerline.base.bash"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue