From 4fb85b57b8a06b5d576c28670ab18e839edf60ab Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 22 Dec 2014 12:30:06 +0100 Subject: [PATCH] nmcli/bash-completion: fix detecting connection for connection modify Previously we would only complete connections given by ID. The following would work: $ nmcli connection modify id $ nmcli connection modify $ nmcli connection modify uuid but the following would not work: $ nmcli connection modify (cherry picked from commit 5ef233936ad270b45c65daccbfd939c5c3c4c0c0) --- clients/cli/nmcli-completion | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index 73028bdff2..35062a5fa9 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -1159,14 +1159,14 @@ _nmcli() if [[ "${words[0]:0:1}" == [+-] ]]; then PREFIX="${words[0]:0:1}" fi - _nmcli_list_nl "$(nmcli --fields profile connection show "${COMMAND_CONNECTION_TYPE:-id}" "$COMMAND_CONNECTION_ID" 2>/dev/null | sed -n 's/^\([^:]\+\):.*/'$PREFIX'\1/p')" + _nmcli_list_nl "$(nmcli --fields profile connection show ${COMMAND_CONNECTION_TYPE} "$COMMAND_CONNECTION_ID" 2>/dev/null | sed -n 's/^\([^:]\+\):.*/'$PREFIX'\1/p')" return 0 elif [[ ${#words[@]} -le 2 ]]; then return 0 fi _nmcli_array_delete_at words 0 1 done - _nmcli_list_nl "$(nmcli --fields profile connection show "${COMMAND_CONNECTION_TYPE:-id}" "$COMMAND_CONNECTION_ID" 2>/dev/null | sed -n 's/^\([^:]\+\):.*/\1/p')" + _nmcli_list_nl "$(nmcli --fields profile connection show ${COMMAND_CONNECTION_TYPE} "$COMMAND_CONNECTION_ID" 2>/dev/null | sed -n 's/^\([^:]\+\):.*/\1/p')" return 0 fi ;;