colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli/bash-completion: normalize OPTIONS_TYPE to use it inside _nmcli_compl_ARGS()

Browse Source 
Later _nmcli_compl_ARGS() wants to check $OPTIONS_TYPE to behave differently
depending on the type. As we accept abbreviations of $OPTIONS_TYPE, let's normalize
the value, so that we don't have to consider abbrevations later on.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-10-21 08:07:19 +02:00
parent 60aee59f18
commit 08c0e73ec5
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
clients/cli/nmcli-completion
View File

@@ -909,67 +909,84 @@ _nmcli()
case "$OPTIONS_TYPE" in case "$OPTIONS_TYPE" in
802-3|802-3-|802-3-e|802-3-et|802-3-eth|802-3-ethe|802-3-ether|802-3-ethern|802-3-etherne|802-3-ethernet| \ 802-3|802-3-|802-3-e|802-3-et|802-3-eth|802-3-ethe|802-3-ether|802-3-ethern|802-3-etherne|802-3-ethernet| \
e|et|eth|ethe|ether|ethern|etherne|ethernet) e|et|eth|ethe|ether|ethern|etherne|ethernet)
OPTIONS_TYPE=ethernet
OPTIONS_TYPED=(mac cloned-mac mtu) OPTIONS_TYPED=(mac cloned-mac mtu)
;; ;;
802-11-w|802-11-wi|802-11-wir|802-11-wire|802-11-wirel|802-11-wirele|802-11-wireles|802-11-wireless| \ 802-11-w|802-11-wi|802-11-wir|802-11-wire|802-11-wirel|802-11-wirele|802-11-wireles|802-11-wireless| \
wif|wifi) wif|wifi)
OPTIONS_TYPE=wifi
OPTIONS_TYPED=(ssid mac cloned-mac mtu) OPTIONS_TYPED=(ssid mac cloned-mac mtu)
OPTIONS_MANDATORY=(ssid) OPTIONS_MANDATORY=(ssid)
;; ;;
wim|wima|wimax) wim|wima|wimax)
OPTIONS_TYPE=wimax
OPTIONS_TYPED=(mac nsp) OPTIONS_TYPED=(mac nsp)
;; ;;
g|gs|gsm) g|gs|gsm)
OPTIONS_TYPE=gsm
OPTIONS_TYPED=(apn user password) OPTIONS_TYPED=(apn user password)
OPTIONS_MANDATORY=(apn) OPTIONS_MANDATORY=(apn)
;; ;;
c|cd|cdm|cdma) c|cd|cdm|cdma)
OPTIONS_TYPE=cdma
OPTIONS_TYPED=(user password) OPTIONS_TYPED=(user password)
;; ;;
i|in|inf|infi|infin|infini|infinib|infiniba|infiniban|infiniband) i|in|inf|infi|infin|infini|infinib|infiniba|infiniban|infiniband)
OPTIONS_TYPE=infiniband
OPTIONS_TYPED=(mac mtu transport-mode parent p-key) OPTIONS_TYPED=(mac mtu transport-mode parent p-key)
;; ;;
bl|blu|blue|bluet|blueto|bluetoo|bluetoot|bluetooth) bl|blu|blue|bluet|blueto|bluetoo|bluetoot|bluetooth)
OPTIONS_TYPE=bluetooth
OPTIONS_TYPED=(addr bt-type) OPTIONS_TYPED=(addr bt-type)
;; ;;
vl|vla|vlan) vl|vla|vlan)
OPTIONS_TYPE=vlan
OPTIONS_TYPED=(dev id flags ingress egress mtu) OPTIONS_TYPED=(dev id flags ingress egress mtu)
OPTIONS_MANDATORY=(dev) OPTIONS_MANDATORY=(dev)
;; ;;
bond) bond)
OPTIONS_TYPE=bond
OPTIONS_TYPED=(mode miimon downdelay updelay arp-interval arp-ip-target primary lacp-rate) OPTIONS_TYPED=(mode miimon downdelay updelay arp-interval arp-ip-target primary lacp-rate)
;; ;;
bond-|bond-s|bond-sl|bond-sla|bond-slav|bond-slave) bond-|bond-s|bond-sl|bond-sla|bond-slav|bond-slave)
OPTIONS_TYPE=bond-slave
OPTIONS_TYPED=(master) OPTIONS_TYPED=(master)
OPTIONS_MANDATORY=(master) OPTIONS_MANDATORY=(master)
OPTIONS_IP=() OPTIONS_IP=()
;; ;;
team) team)
OPTIONS_TYPE=team
OPTIONS_TYPED=(config) OPTIONS_TYPED=(config)
;; ;;
team-|team-s|team-sl|team-sla|team-slav|team-slave) team-|team-s|team-sl|team-sla|team-slav|team-slave)
OPTIONS_TYPE=team-slave
OPTIONS_TYPED=(master config) OPTIONS_TYPED=(master config)
OPTIONS_MANDATORY=(master) OPTIONS_MANDATORY=(master)
OPTIONS_IP=() OPTIONS_IP=()
;; ;;
bridge) bridge)
OPTIONS_TYPE=bridge
OPTIONS_TYPED=(stp priority forward-delay hello-time max-age ageing-time mac) OPTIONS_TYPED=(stp priority forward-delay hello-time max-age ageing-time mac)
;; ;;
bridge-|bridge-s|bridge-sl|bridge-sla|bridge-slav|bridge-slave) bridge-|bridge-s|bridge-sl|bridge-sla|bridge-slav|bridge-slave)
OPTIONS_TYPE=bridge-slave
OPTIONS_TYPED=(master priority path-cost hairpin) OPTIONS_TYPED=(master priority path-cost hairpin)
OPTIONS_MANDATORY=(master) OPTIONS_MANDATORY=(master)
OPTIONS_IP=() OPTIONS_IP=()
;; ;;
vp|vpn) vp|vpn)
OPTIONS_TYPE=vpn
OPTIONS_TYPED=(vpn-type user) OPTIONS_TYPED=(vpn-type user)
OPTIONS_MANDATORY=(vpn-type) OPTIONS_MANDATORY=(vpn-type)
;; ;;
802-11-o|802-11-ol|802-11-olp|802-11-olpc|802-11-olpc-|802-11-olpc-m|802-11-olpc-me|802-11-olpc-mes|802-11-olpc-mesh| \ 802-11-o|802-11-ol|802-11-olp|802-11-olpc|802-11-olpc-|802-11-olpc-m|802-11-olpc-me|802-11-olpc-mes|802-11-olpc-mesh| \
o|ol|olp|olpc|olpc-|olpc-m|olpc-me|olpc-mes|olpc-mesh) o|ol|olp|olpc|olpc-|olpc-m|olpc-me|olpc-mes|olpc-mesh)
OPTIONS_TYPE=olpc-mesh
OPTIONS_TYPED=(ssid channel dhcp-anycast) OPTIONS_TYPED=(ssid channel dhcp-anycast)
OPTIONS_MANDATORY=(ssid) OPTIONS_MANDATORY=(ssid)
;; ;;
p|pp|ppp|pppo|pppoe) p|pp|ppp|pppo|pppoe)
OPTIONS_TYPE=pppoe
OPTIONS_TYPED=(username password service mtu mac) OPTIONS_TYPED=(username password service mtu mac)
OPTIONS_MANDATORY=(username) OPTIONS_MANDATORY=(username)
;; ;;