From 3b2eb02bc91edb51b0387125fc94a3cc3aa7a752 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 19 Aug 2022 12:09:41 +0200 Subject: [PATCH] scripts/bash-completion: Adjustments for older Bash versions Older versions of Bash don't handle -v option in array context very well. Also, some of the compopt options are missing in older versions so make sure stderr stays silent. Signed-off-by: Michal Berger Change-Id: I81989940e8b25e2dbeed91f97fed5aa65e7df656 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14130 Reviewed-by: Jim Harris Reviewed-by: Paul Luse Reviewed-by: Ben Walker Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Krzysztof Karas --- scripts/bash-completion/spdk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bash-completion/spdk b/scripts/bash-completion/spdk index 99c3c1858..0068e8444 100644 --- a/scripts/bash-completion/spdk +++ b/scripts/bash-completion/spdk @@ -75,7 +75,7 @@ _get_help_rpc_method() { _is_rpc_method() { local word=$1 - [[ -v rpc_methods["$word"] ]] + [[ -n $word && -n ${rpc_methods["$word"]} ]] } _method_in_words() { @@ -148,7 +148,7 @@ _spdk_opt_to_complete() { fi ;; *) return 1 ;; - esac + esac 2> /dev/null return 0 } @@ -218,7 +218,7 @@ _rpc() { _filedir else COMPREPLY=($(compgen -W '${!rpc_methods[*]}' -- "$cur")) - fi + fi 2> /dev/null } _spdk_app() {