From e6fdd35a83881a957ac206b4e128886d07f37c71 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Fri, 9 Jul 2021 00:23:52 +0200 Subject: 49150: consistently use singular form for headings on completion match groups --- Completion/BSD/Command/_portmaster | 14 +++++++------- Completion/BSD/Command/_sysrc | 2 +- Completion/BSD/Command/_systat | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'Completion/BSD') diff --git a/Completion/BSD/Command/_portmaster b/Completion/BSD/Command/_portmaster index 48390c9ad..ee6fefc6e 100644 --- a/Completion/BSD/Command/_portmaster +++ b/Completion/BSD/Command/_portmaster @@ -8,11 +8,11 @@ _portmaster_ports() { local expl ret=1 _fbsd_ports _fbsd_cat _fbsd_cat=(${PORTSDIR:-/usr/ports}/[a-z]*(/:t)) if [[ $PREFIX != */* ]] ; then - _wanted cat_packages expl 'category/ports' compadd -S '/' $_fbsd_cat + _wanted cat_packages expl 'category/port' compadd -S '/' $_fbsd_cat else compset -P '*/' _fbsd_ports=(${PORTSDIR:-/usr/ports}/$IPREFIX/*(/:t)) - _wanted cat_packages expl 'category/ports' compadd $_fbsd_ports + _wanted cat_packages expl 'category/port' compadd $_fbsd_ports fi return ret } @@ -77,7 +77,7 @@ _portmaster() { _arguments -s \ $standalone_args \ $common_args \ - '*:packages and ports:_portmaster_pkgs_and_ports' + '*:package or port:_portmaster_pkgs_and_ports' else case "$words[2]" in --clean-distfiles|--clean-distfiles-all|--check-depends|--check-port-dbdir|--version|-help|-h) @@ -86,14 +86,14 @@ _portmaster() { *) if (( $words[(I)-(e|r)] ));then _arguments -s \ - '*:packages:_portmaster_pkgs' + '*:package:_portmaster_pkgs' elif (( kid=$words[(I)-o] ));then if (( CURRENT == $kid + 1 ));then _arguments -s \ - '*:ports replacing:_portmaster_ports' + '*:replacement port:_portmaster_ports' elif (( CURRENT == $kid + 2 )); then _arguments -s \ - '*:package to replace:_portmaster_pkgs' + '*:package to replace:_portmaster_pkgs' else return 0 fi @@ -102,7 +102,7 @@ _portmaster() { else _arguments -s \ $common_args \ - '*:packages and ports:_portmaster_pkgs_and_ports' + '*:package or port:_portmaster_pkgs_and_ports' fi ;; esac diff --git a/Completion/BSD/Command/_sysrc b/Completion/BSD/Command/_sysrc index f0c12a2be..892dac407 100644 --- a/Completion/BSD/Command/_sysrc +++ b/Completion/BSD/Command/_sysrc @@ -29,7 +29,7 @@ _sysrc() { '(- *)-h[print short usage message]' \ '(- *)--help[print full usage message]' \ '-i[ignore unknown variables]' \ - '-j+[jail to operate within]:jails:_jails' \ + '-j+[jail to operate within]:jail:_jails' \ '-n[print only variable values]' \ '-N[print only variable names]' \ '-R+[specify an alternative root]:alternative root:_files -/' \ diff --git a/Completion/BSD/Command/_systat b/Completion/BSD/Command/_systat index 7d837790a..03df07631 100644 --- a/Completion/BSD/Command/_systat +++ b/Completion/BSD/Command/_systat @@ -84,7 +84,7 @@ esac if (( $#screens )); then _arguments -M 'r:|.=* r:|=*' : $opts \ - '1:systat(1) displays:(( ${pre}$^screens ))' \ + '1:systat(1) display:(( ${pre}$^screens ))' \ '2:refresh interval' return fi -- cgit 1.4.1