[pbs-devel] [PATCH v6 proxmox-backup 56/65] test-suite: add bin to deb, add shell completions

Dominik Csapak d.csapak at proxmox.com
Thu May 23 11:32:22 CEST 2024


adding this is quite nice, but i'm unsure if we want to add it by default to the main package?

maybe a seperate one?

but not an issue either way for me

On 5/14/24 12:34, Christian Ebner wrote:
> Adds the required files for bash and zsh completion and packages the
> binary to be included in the proxmox-backup-client debian package.
> 
> Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
> ---
>   Makefile                                     | 13 ++++++++-----
>   debian/proxmox-backup-client.bash-completion |  1 +
>   debian/proxmox-backup-client.install         |  2 ++
>   debian/proxmox-backup-test-suite.bc          |  8 ++++++++
>   zsh-completions/_proxmox-backup-test-suite   | 13 +++++++++++++
>   5 files changed, 32 insertions(+), 5 deletions(-)
>   create mode 100644 debian/proxmox-backup-test-suite.bc
>   create mode 100644 zsh-completions/_proxmox-backup-test-suite
> 
> diff --git a/Makefile b/Makefile
> index 03e938767..76529921b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -8,11 +8,12 @@ SUBDIRS := etc www docs templates
>   
>   # Binaries usable by users
>   USR_BIN := \
> -	proxmox-backup-client 	\
> -	proxmox-file-restore	\
> -	pxar			\
> -	proxmox-tape		\
> -	pmtx			\
> +	proxmox-backup-client 		\
> +	proxmox-backup-test-suite 	\
> +	proxmox-file-restore		\
> +	pxar				\
> +	proxmox-tape			\
> +	pmtx				\
>   	pmt
>   
>   # Binaries usable by admins
> @@ -165,6 +166,8 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
>   	    --bin proxmox-backup-client \
>   	    --bin dump-catalog-shell-cli \
>   	    --bin proxmox-backup-debug \
> +	    --package proxmox-backup-test-suite \
> +	    --bin proxmox-backup-test-suite \
>   	    --package proxmox-file-restore \
>   	    --bin proxmox-file-restore \
>   	    --package pxar-bin \
> diff --git a/debian/proxmox-backup-client.bash-completion b/debian/proxmox-backup-client.bash-completion
> index 437360175..c4ff02ae6 100644
> --- a/debian/proxmox-backup-client.bash-completion
> +++ b/debian/proxmox-backup-client.bash-completion
> @@ -1,2 +1,3 @@
>   debian/proxmox-backup-client.bc proxmox-backup-client
> +debian/proxmox-backup-test-suite.bc proxmox-backup-test-suite
>   debian/pxar.bc pxar
> diff --git a/debian/proxmox-backup-client.install b/debian/proxmox-backup-client.install
> index 74b568f17..0eb859757 100644
> --- a/debian/proxmox-backup-client.install
> +++ b/debian/proxmox-backup-client.install
> @@ -1,6 +1,8 @@
>   usr/bin/proxmox-backup-client
> +usr/bin/proxmox-backup-test-suite
>   usr/bin/pxar
>   usr/share/man/man1/proxmox-backup-client.1
>   usr/share/man/man1/pxar.1
>   usr/share/zsh/vendor-completions/_proxmox-backup-client
> +usr/share/zsh/vendor-completions/_proxmox-backup-test-suite
>   usr/share/zsh/vendor-completions/_pxar
> diff --git a/debian/proxmox-backup-test-suite.bc b/debian/proxmox-backup-test-suite.bc
> new file mode 100644
> index 000000000..2686d7eaa
> --- /dev/null
> +++ b/debian/proxmox-backup-test-suite.bc
> @@ -0,0 +1,8 @@
> +# proxmox-backup-test-suite bash completion
> +
> +# see http://tiswww.case.edu/php/chet/bash/FAQ
> +# and __ltrim_colon_completions() in /usr/share/bash-completion/bash_completion
> +# this modifies global var, but I found no better way
> +COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
> +
> +complete -C 'proxmox-backup-test-suite bashcomplete' proxmox-backup-test-suite
> diff --git a/zsh-completions/_proxmox-backup-test-suite b/zsh-completions/_proxmox-backup-test-suite
> new file mode 100644
> index 000000000..72ebcea5f
> --- /dev/null
> +++ b/zsh-completions/_proxmox-backup-test-suite
> @@ -0,0 +1,13 @@
> +#compdef _proxmox-backup-test-suite() proxmox-backup-test-suite
> +
> +function _proxmox-backup-test-suite() {
> +    local cwords line point cmd curr prev
> +    cwords=${#words[@]}
> +    line=$words
> +    point=${#line}
> +    cmd=${words[1]}
> +    curr=${words[cwords]}
> +    prev=${words[cwords-1]}
> +    compadd -- $(COMP_CWORD="$cwords" COMP_LINE="$line" COMP_POINT="$point" \
> +        proxmox-backup-test-suite bashcomplete "$cmd" "$curr" "$prev")
> +}





More information about the pbs-devel mailing list