From 6fc90b21e8fe0248ed040716e02fc6cc09903180 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sun, 1 Oct 2023 03:19:46 +0900 Subject: [PATCH] completions/{cap,homesick,rake,sdkman,ssh}: Rename completion functions --- completions/capistrano.completion.sh | 4 ++-- completions/homesick.completion.sh | 4 ++-- completions/rake.completion.sh | 4 ++-- completions/sdkman.completion.sh | 13 ++++++------- completions/ssh.completion.sh | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/completions/capistrano.completion.sh b/completions/capistrano.completion.sh index dd34dd3..a91fa4e 100644 --- a/completions/capistrano.completion.sh +++ b/completions/capistrano.completion.sh @@ -3,7 +3,7 @@ export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/} -function _capcomplete { +function _omb_completion_cap { if [ -f Capfile ]; then recent=`ls -t .cap_tasks~ Capfile **/*.cap 2> /dev/null | head -n 1` if [[ $recent != '.cap_tasks~' ]]; then @@ -21,4 +21,4 @@ function _capcomplete { fi } -complete -o default -o nospace -F _capcomplete cap +complete -o default -o nospace -F _omb_completion_cap cap diff --git a/completions/homesick.completion.sh b/completions/homesick.completion.sh index 0221a7a..57b4ea1 100644 --- a/completions/homesick.completion.sh +++ b/completions/homesick.completion.sh @@ -4,7 +4,7 @@ # The homebrew bash completion script was used as inspiration. # Originally from https://github.com/liborw/homesick-completion -_homesick_complete() +_omb_completion_homesick() { local cur="${COMP_WORDS[COMP_CWORD]}" local options="--skip --force --pretend --quiet" @@ -57,5 +57,5 @@ _homesick_complete() esac } -complete -o bashdefault -o default -F _homesick_complete homesick +complete -o bashdefault -o default -F _omb_completion_homesick homesick diff --git a/completions/rake.completion.sh b/completions/rake.completion.sh index 13df9d8..0ee5cd8 100644 --- a/completions/rake.completion.sh +++ b/completions/rake.completion.sh @@ -3,7 +3,7 @@ export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/} -function _rakecomplete { +function _omb_completion_rake { if [ -f Rakefile ]; then recent=`ls -t .rake_tasks~ Rakefile **/*.rake 2> /dev/null | head -n 1` if [[ $recent != '.rake_tasks~' ]]; then @@ -14,4 +14,4 @@ function _rakecomplete { fi } -complete -o default -o nospace -F _rakecomplete rake +complete -o default -o nospace -F _omb_completion_rake rake diff --git a/completions/sdkman.completion.sh b/completions/sdkman.completion.sh index 60f280a..cd02662 100644 --- a/completions/sdkman.completion.sh +++ b/completions/sdkman.completion.sh @@ -1,5 +1,5 @@ #! bash oh-my-bash.module -_sdkman_complete() +_omb_completion_sdkman() { local CANDIDATES local CANDIDATE_VERSIONS @@ -29,7 +29,7 @@ _sdkman_complete() elif [ $COMP_CWORD -eq 3 ]; then case "${COMP_WORDS[COMP_CWORD-2]}" in "install" | "uninstall" | "rm" | "use" | "default" ) - _sdkman_candidate_versions ${COMP_WORDS[COMP_CWORD-1]} + _omb_completion_sdkman__candidate_versions ${COMP_WORDS[COMP_CWORD-1]} COMPREPLY=( $(compgen -W "$CANDIDATE_VERSIONS" -- ${COMP_WORDS[COMP_CWORD]}) ) ;; *) @@ -40,9 +40,9 @@ _sdkman_complete() return 0 } -function _sdkman_candidate_versions { +function _omb_completion_sdkman__candidate_versions { - CANDIDATE_LOCAL_VERSIONS=$(__sdkman_cleanup_local_versions $1) + CANDIDATE_LOCAL_VERSIONS=$(_omb_completion_sdkman__cleanup_local_versions $1) if [ "$SDKMAN_OFFLINE_MODE" = "true" ]; then CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS else @@ -52,11 +52,10 @@ function _sdkman_candidate_versions { } -function __sdkman_cleanup_local_versions { - +function _omb_completion_sdkman__cleanup_local_versions { __sdkman_build_version_csv $1 echo $CSV | tr ',' ' ' } -complete -F _sdkman_complete sdk +complete -F _omb_completion_sdkman sdk diff --git a/completions/ssh.completion.sh b/completions/ssh.completion.sh index 6beb554..4791996 100644 --- a/completions/ssh.completion.sh +++ b/completions/ssh.completion.sh @@ -3,7 +3,7 @@ export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/} -function _sshcomplete { +function _omb_completion_ssh { local CURRENT_PROMPT="${COMP_WORDS[COMP_CWORD]}" if [[ ${CURRENT_PROMPT} == *@* ]] ; then local OPTIONS="-P ${CURRENT_PROMPT/@*/}@ -- ${CURRENT_PROMPT/*@/}" @@ -32,4 +32,4 @@ function _sshcomplete { return 0 } -complete -o default -o nospace -F _sshcomplete ssh scp +complete -o default -o nospace -F _omb_completion_ssh ssh scp