From f9780a4a510ca39d8633761f91503b1563f47fb7 Mon Sep 17 00:00:00 2001 From: Frank Viernau Date: Thu, 4 Apr 2024 15:04:06 +0200 Subject: [PATCH] chore(integrations): Re-generate shell completion scripts The scripts have been updated via gradle by running e.g. [1]. [1] `./gradlew -q :cli:run --args="--generate-completion=zsh" > integrations/completions/ort-completion.zsh` Signed-off-by: Frank Viernau --- integrations/completions/ort-completion.bash | 11 ++++++++++- integrations/completions/ort-completion.fish | 3 ++- integrations/completions/ort-completion.zsh | 15 +++++++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/integrations/completions/ort-completion.bash b/integrations/completions/ort-completion.bash index 3de1707f4dc9a..ec7b053b2fe69 100644 --- a/integrations/completions/ort-completion.bash +++ b/integrations/completions/ort-completion.bash @@ -906,6 +906,12 @@ _ort_migrate() { [[ ${i} -gt COMP_CWORD ]] && in_param='--nuget-ids' || in_param='' continue ;; + --pub-ids) + __skip_opt_eq + (( i = i + 1 )) + [[ ${i} -gt COMP_CWORD ]] && in_param='--pub-ids' || in_param='' + continue + ;; -h|--help) __skip_opt_eq in_param='' @@ -923,7 +929,7 @@ _ort_migrate() { done local word="${COMP_WORDS[$COMP_CWORD]}" if [[ "${word}" =~ ^[-] ]]; then - COMPREPLY=($(compgen -W '--hocon-to-yaml --nuget-ids -h --help' -- "${word}")) + COMPREPLY=($(compgen -W '--hocon-to-yaml --nuget-ids --pub-ids -h --help' -- "${word}")) return fi @@ -939,6 +945,9 @@ _ort_migrate() { --nuget-ids) COMPREPLY=($(compgen -o default -- "${word}")) ;; + --pub-ids) + COMPREPLY=($(compgen -o default -- "${word}")) + ;; --help) ;; esac diff --git a/integrations/completions/ort-completion.fish b/integrations/completions/ort-completion.fish index 19004c25b81ac..83ed6a1b072c1 100644 --- a/integrations/completions/ort-completion.fish +++ b/integrations/completions/ort-completion.fish @@ -34,7 +34,7 @@ complete -c ort -n "__fish_seen_subcommand_from advise" -s h -l help -d 'Show th complete -c ort -f -n __fish_use_subcommand -a analyze -d 'Determine dependencies of a software project.' ## Options for analyze -complete -c ort -n "__fish_seen_subcommand_from analyze" -l input-dir -s i -r -F -d 'The project directory to analyze. As a special case, if only one package manager is enabled, this may point to a definition file for that package manager to only analyze that single project.' +complete -c ort -n "__fish_seen_subcommand_from analyze" -l input-dir -s i -r -F -d 'The project directory to analyze. May point to a definition file if only a single package manager is enabled.' complete -c ort -n "__fish_seen_subcommand_from analyze" -l output-dir -s o -r -F -d 'The directory to write the ORT result file with analyzer results to.' complete -c ort -n "__fish_seen_subcommand_from analyze" -l output-formats -s f -r -fa "JSON XML YAML" -d 'The list of output formats to be used for the ORT result file(s).' complete -c ort -n "__fish_seen_subcommand_from analyze" -l repository-configuration-file -r -F -d 'A file containing the repository configuration. If set, overrides any repository configuration contained in a \'.ort.yml\' file in the repository.' @@ -119,6 +119,7 @@ complete -c ort -f -n __fish_use_subcommand -a migrate -d 'Assist with migrating ## Options for migrate complete -c ort -n "__fish_seen_subcommand_from migrate" -l hocon-to-yaml -r -F -d 'Perform a simple conversion of the given HOCON configuration file to YAML and print the result.' complete -c ort -n "__fish_seen_subcommand_from migrate" -l nuget-ids -r -F -d 'Convert NuGet package IDs in curations and configurations to the new format that includes a namespace.' +complete -c ort -n "__fish_seen_subcommand_from migrate" -l pub-ids -r -F -d 'Convert Pub package IDs in curations and configurations to the new format that has no namespace.' complete -c ort -n "__fish_seen_subcommand_from migrate" -s h -l help -d 'Show this message and exit' diff --git a/integrations/completions/ort-completion.zsh b/integrations/completions/ort-completion.zsh index abe80d4314b5b..df61c37f7c81d 100644 --- a/integrations/completions/ort-completion.zsh +++ b/integrations/completions/ort-completion.zsh @@ -2,7 +2,9 @@ # Command completion for ort # Generated by Clikt -autoload bashcompinit +autoload -Uz compinit +compinit +autoload -Uz bashcompinit bashcompinit __skip_opt_eq() { @@ -909,6 +911,12 @@ _ort_migrate() { [[ ${i} -gt COMP_CWORD ]] && in_param='--nuget-ids' || in_param='' continue ;; + --pub-ids) + __skip_opt_eq + (( i = i + 1 )) + [[ ${i} -gt COMP_CWORD ]] && in_param='--pub-ids' || in_param='' + continue + ;; -h|--help) __skip_opt_eq in_param='' @@ -926,7 +934,7 @@ _ort_migrate() { done local word="${COMP_WORDS[$COMP_CWORD]}" if [[ "${word}" =~ ^[-] ]]; then - COMPREPLY=($(compgen -W '--hocon-to-yaml --nuget-ids -h --help' -- "${word}")) + COMPREPLY=($(compgen -W '--hocon-to-yaml --nuget-ids --pub-ids -h --help' -- "${word}")) return fi @@ -942,6 +950,9 @@ _ort_migrate() { --nuget-ids) COMPREPLY=($(compgen -o default -- "${word}")) ;; + --pub-ids) + COMPREPLY=($(compgen -o default -- "${word}")) + ;; --help) ;; esac