James Le Cuirot <[email protected]> writes:

Nice.

> Signed-off-by: James Le Cuirot <[email protected]>
> ---
>  app-containers/cri-tools/cri-tools-1.33.0.ebuild | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/app-containers/cri-tools/cri-tools-1.33.0.ebuild 
> b/app-containers/cri-tools/cri-tools-1.33.0.ebuild
> index 241db61dc90c..1a18abf10564 100644
> --- a/app-containers/cri-tools/cri-tools-1.33.0.ebuild
> +++ b/app-containers/cri-tools/cri-tools-1.33.0.ebuild
> @@ -3,7 +3,7 @@
>  
>  EAPI=8
>  
> -inherit go-env go-module shell-completion toolchain-funcs
> +inherit go-env go-module shell-completion sysroot toolchain-funcs
>  
>  DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
>  HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools";
> @@ -21,18 +21,14 @@ src_compile() {
>       CRICTL="build/bin/${GOOS}/${GOARCH}/crictl"
>       emake VERSION="${PV}"
>  
> -     if ! tc-is-cross-compiler; then
> -             "${CRICTL}" completion bash > crictl.bash || die
> -             "${CRICTL}" completion zsh > crictl.zsh || die
> -     fi
> +     sysroot_try_run_prefixed "${CRICTL}" completion bash > crictl.bash || 
> die
> +     sysroot_try_run_prefixed "${CRICTL}" completion zsh > crictl.zsh || die
>  }
>  
>  src_install() {
>       einstalldocs
>       dobin "${CRICTL}"
>  
> -     if ! tc-is-cross-compiler; then
> -             newbashcomp crictl.bash crictl
> -             newzshcomp crictl.zsh _crictl
> -     fi
> +     [[ -s crictl.bash ]] && newbashcomp crictl.bash crictl
> +     [[ -s crictl.zsh ]] && newzshcomp crictl.zsh _crictl
>  }

Attachment: signature.asc
Description: PGP signature

Reply via email to