summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-08-13 14:59:33 +0200
committerThomas Haller <thaller@redhat.com>2015-08-13 15:01:53 +0200
commit3de0731619314f23cf436f4f2061b0d6d7b09088 (patch)
treeddf27786369fb3a7a669da2b4e042e68e17c46f2
parenta8fb8a8143ae9efedb2744176089e9cd6e8c9054 (diff)
downloadNetworkManager-jk/nmcli-hidden-ssid-bgo752173.tar.gz
fixup! cli: add 'ssid' parameter for 'nmcli device wifi rescan'jk/nmcli-hidden-ssid-bgo752173
-rw-r--r--clients/cli/nmcli-completion7
1 files changed, 5 insertions, 2 deletions
diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion
index 0eb18375f8..b58efde36d 100644
--- a/clients/cli/nmcli-completion
+++ b/clients/cli/nmcli-completion
@@ -580,7 +580,9 @@ _nmcli_compl_ARGS()
# remove the options already seen.
for i in ${!OPTIONS[*]}; do
if [[ "${OPTIONS[$i]}" = "${REMOVE_OPTIONS[0]}" || "${OPTIONS[$i]}" = "${REMOVE_OPTIONS[1]}" ]]; then
- unset OPTIONS[$i]
+ if ! _nmcli_array_has_value OPTIONS_REPEATABLE "${OPTIONS[$i]}" ; then
+ unset OPTIONS[$i]
+ fi
fi
done
for i in ${!OPTIONS_MANDATORY[*]}; do
@@ -738,7 +740,7 @@ _nmcli()
cur=''
fi
- local OPTIONS_UNKNOWN_OPTION OPTIONS_TYPE OPTIONS_TYPED OPTIONS OPTIONS_MANDATORY COMMAND_ARGS_WAIT_OPTIONS OPTIONS_IP OPTIONS_MANDATORY OPTIONS_NEXT_GROUP OPTIONS_SEP
+ local OPTIONS_UNKNOWN_OPTION OPTIONS_TYPE OPTIONS_TYPED OPTIONS OPTIONS_MANDATORY COMMAND_ARGS_WAIT_OPTIONS OPTIONS_IP OPTIONS_MANDATORY OPTIONS_NEXT_GROUP OPTIONS_SEP OPTIONS_REPEATABLE
local COMMAND_CONNECTION_TYPE COMMAND_CONNECTION_ID OPTIONS_MANDATORY_IFNAME HELP_ONLY_AS_FIRST
local COMMAND_CONNECTION_ACTIVE=""
@@ -1294,6 +1296,7 @@ _nmcli()
;;
r|re|res|resc|resca|rescan)
_nmcli_array_delete_at words 0 2
+ OPTIONS_REPEATABLE=(ssid)
OPTIONS=(ifname ssid)
_nmcli_compl_ARGS
;;