From ffe06ffa2a83db41e166748b8002498ae2c218a5 Mon Sep 17 00:00:00 2001 From: "willian.eth" Date: Wed, 29 Jun 2022 19:41:39 +0200 Subject: [PATCH] build: fix auto-completion scripts and include them in .deb package (#25195) Co-authored-by: Felix Lange --- build/deb/ethereum/completions/bash_autocomplete | 9 ++------- build/deb/ethereum/completions/zsh_autocomplete | 6 ++---- build/deb/ethereum/deb.install | 4 ++++ 3 files changed, 8 insertions(+), 11 deletions(-) mode change 100644 => 100755 build/deb/ethereum/completions/bash_autocomplete diff --git a/build/deb/ethereum/completions/bash_autocomplete b/build/deb/ethereum/completions/bash_autocomplete old mode 100644 new mode 100755 index f0f624183bd06..a78952793efb1 --- a/build/deb/ethereum/completions/bash_autocomplete +++ b/build/deb/ethereum/completions/bash_autocomplete @@ -1,8 +1,4 @@ -#! /bin/bash - -: ${PROG:=$(basename ${BASH_SOURCE})} - -_cli_bash_autocomplete() { +_geth_bash_autocomplete() { if [[ "${COMP_WORDS[0]}" != "source" ]]; then local cur opts base COMPREPLY=() @@ -17,5 +13,4 @@ _cli_bash_autocomplete() { fi } -complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete $PROG -unset PROG +complete -o bashdefault -o default -o nospace -F _geth_bash_autocomplete geth diff --git a/build/deb/ethereum/completions/zsh_autocomplete b/build/deb/ethereum/completions/zsh_autocomplete index b519666f809cf..119794c532bda 100644 --- a/build/deb/ethereum/completions/zsh_autocomplete +++ b/build/deb/ethereum/completions/zsh_autocomplete @@ -1,6 +1,4 @@ -#compdef $PROG - -_cli_zsh_autocomplete() { +_geth_zsh_autocomplete() { local -a opts local cur cur=${words[-1]} @@ -17,4 +15,4 @@ _cli_zsh_autocomplete() { fi } -compdef _cli_zsh_autocomplete $PROG +compdef _geth_zsh_autocomplete geth diff --git a/build/deb/ethereum/deb.install b/build/deb/ethereum/deb.install index e7666ce5fb6b4..019bd0f4bb3fa 100644 --- a/build/deb/ethereum/deb.install +++ b/build/deb/ethereum/deb.install @@ -1 +1,5 @@ build/bin/{{.BinaryName}} usr/bin +{{- if eq .BinaryName "geth" }} +build/deb/ethereum/completions/bash_autocomplete etc/bash_completion.d/geth +build/deb/ethereum/completions/zsh_autocomplete usr/share/zsh/vendor-completions/_geth +{{end -}}