misc. tweaks to GitHub zsh-users#131

general: adjust wording for consistency, conventional mood and capitalisation

_apt:

  - improve _apt_sources(). simplify apt-config calls. add fall-back paths.
    don't create global sources array

  - rename _snapshotdates() to _apt_snapshot_dates. eliminate superfluous
    getdates() function. use $commands instead of whence. eliminate superfluous
    variable

_fortune: use _files to complete databases

_smartmontools: fix -j/--json exclusivity, --json optarg style

_schroot: fix -n/-o optargs, short option optarg styles

Author: okdana

Completion/Debian/Command/_apt

@@ -430,7 +430,7 @@ _apt-cmd () {
     /$'changelog\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /$'full-upgrade\0'/ \| \
     /$'dist-upgrade\0'/ \| \
-    /$'edit-sources\0'/ /$'[^\0]#\0'/ ':sourcefiles::_values 'sourcefiles' $sources ' \# \| \
+    /$'edit-sources\0'/ /$'[^\0]#\0'/ ': ::_apt_sources' \# \| \
     /"[]"/ ':argument-1::compadd "$expl_action[@]" list search showsrc show depends rdepends policy update install reinstall download source build-dep satisfy remove upgrade full-upgrade dist-upgrade edit-sources autoclean distclean changelog autoremove autopurge purge'
 
   _apt-cmd () {
@@ -482,7 +482,7 @@ _apt-get () {
     --arch-only:bool \
     --allow-unauthenticated:bool \
     --auto-remove:bool \
-    -S,--snapshot:_snapshotdates \
+    -S,--snapshot:_apt_snapshot_dates \
     -- \
     /$'update\0'/ \| \
     /$'upgrade\0'/ \| \
@@ -640,12 +640,15 @@ ${${${${(M)tmp:#*release*n=*}#*n=}%%,*}:#now}
 }
 
 _apt_sources () {
-	local sourcelist sourceparts diretc
-	diretc="${"${"$(apt-config shell x dir::etc)"#*\'}"%\'*}"
-	sourceparts="${"${"$(apt-config shell x dir::etc::sourceparts)"#*\'}"%\'*}"
-	print /${diretc}/$sourceparts/*.{list,sources}(N:t)
+  local diretc=etc/apt sourceparts=sources.list.d
+  local -a expl
+
+  eval "$(apt-config shell diretc dir::etc 2> /dev/null)"
+  eval "$(apt-config shell sourceparts dir::etc::sourceparts 2> /dev/null)"
+
+  _description files expl 'source file'
+  _files "${(@)expl}" -W /$diretc/$sourceparts -g '*.(list|sources)(.:t)'
 }
-sources=( $(_apt_sources) )
 
 _apt_releases () {
   local update_policy
@@ -735,21 +738,17 @@ _apt-mark () {
   _apt-mark "$@"
 }
 
-_snapshotdates() {
-  local expl
-  local -a waybackdates
-
-  getdates() {
-    whence -p python3 &>/dev/null || return 0
-    local timespan='-6month'
-    local timestamp="$(date +%Y%m%d --date="${timespan}")"
-    local url="http://snapshot.debian.org/mr/timestamp/?archive=debian&after=${timestamp}"
-    python3 -c 'import sys,urllib.request,json;[print(x) for x in json.loads(urllib.request.urlopen(sys.argv[1]).read())["result"]["debian"]]' "$url" 2>/dev/null || :
-  }
+_apt_snapshot_dates() {
+  local -a expl snapshotdates
   snapshotdates=(
-    ${(u)$(getdates)%T*}
+    ${(u)$(
+      (( $+commands[python3] )) || return 0
+      local timestamp="$(date +%Y%m%d --date=-6month)"
+      local url="http://snapshot.debian.org/mr/timestamp/?archive=debian&after=${timestamp}"
+      python3 -c 'import sys,urllib.request,json;[print(x) for x in json.loads(urllib.request.urlopen(sys.argv[1]).read())["result"]["debian"]]' "$url" 2>/dev/null || :
+    )%T*}
   )
-  _wanted list expl 'wayback date(s)' compadd ${expl} -- ${snapshotdates}
+  _wanted list expl 'wayback date' compadd -- ${snapshotdates}
 }
 
 

Completion/Debian/Command/_apt-file

@@ -28,7 +28,7 @@ case $state in
       'update:resynchronize package contents'
       {find,search}:'search in which package file is included'
       {list,show}:'list contents of a package'
-      'list-indices:list the known content indices'
+      'list-indices:list known content indices'
       'purge:remove all Contents-<ARCH>.gz files in cache directory'
     )
     _describe -t commands 'apt-list command' cmds

Completion/Debian/Command/_dhomepage

@@ -3,10 +3,10 @@
 local arguments
 
 arguments=(
-   '(-v,--vcs)'{-v,--vcs}'[Open VCS-Homepage instead]'
-   '(-e,--echo)'{-e,--echo}'[Only print the URL]'
-   {-h,--help}'[Show help]'
-   '--version[Show version information]'
+   '(-v,--vcs)'{-v,--vcs}'[open VCS homepage instead]'
+   '(-e,--echo)'{-e,--echo}'[only print URL]'
+   {-h,--help}'[show help]'
+   '--version[show version information]'
    ':package:_deb_packages avail'
 )
 

Completion/Debian/Command/_dpkg

@@ -22,7 +22,7 @@ _dpkg_deb_actions=(
   '(--control -e)'{--control,-e}'[extract control]: :_deb_files'
   '(--extract -x)'{--extract,-x}'[extract files]: :_deb_files'
   '(--vextract -X)'{--vextract,-X}'[extract and list files]: :_deb_files'
-  '(--raw-extract -R)'{--raw-extract,-R}'[extracts files and control]: :_deb_files'
+  '(--raw-extract -R)'{--raw-extract,-R}'[extract files and control]: :_deb_files'
   '(--field -f)'{--field,-f}'[show fields]: :_deb_files'
   '--fsys-tarfile[output fs tarfile]: :_deb_files'
   '--ctrl-tarfile[output ctrl tarfile]: :_deb_files'
@@ -42,7 +42,7 @@ _dpkg_actions=(
   '(--remove -r)'{--remove,-r}'[remove package]:*:package:->remove'
   '(--purge -P)'{--purge,-P}'[purge package]:*:package:->purge'
   '(--verify -V)'{--verify,-V}'[verify package]:*:package:->verify'
-  '(--audit -C)'{--audit,-C}'[check for broken pkgs]'
+  '(--audit -C)'{--audit,-C}'[check for broken packages]'
   '--update-avail[update available]:package file:_files'
   '--merge-avail[merge available]:package file:_files'
   '(--record-avail -A)'{--record-avail,-A}'[record available]:*:package files:->record_avail'

Completion/Debian/Command/_schroot

@@ -11,23 +11,23 @@ _arguments -S \
        '--all-sessions[select all active sessions]' \
        '--all-source-chroots[select all source chroots]' \
        '--exclude-aliases[do not include aliases]' \
-       '*'{-c,--chroot=}'[use specified chroot]:chroot:->chroot' \
-       '(-d --directory)'{-d,--directory=}'[directory to use]:dir:_files -W / -P /' \
-       '(-u --user)'{-u,--user=}'[username (default current user)]:user:_users' \
-       '(-s --shell)'{-s,--shell=}'[shell to use as login shell]:shell:->shells' \
+       '*'{-c+,--chroot=}'[use specified chroot]:chroot:->chroot' \
+       '(-d --directory)'{-d+,--directory=}'[directory to use]:dir:_files -W / -P /' \
+       '(-u --user)'{-u+,--user=}'[username (default current user)]:user:_users' \
+       '(-s --shell)'{-s+,--shell=}'[shell to use as login shell]:shell:->shells' \
        '(-l --list)'{-l,--list}'[list available chroots]' \
        '(-i --info)'{-i,--info}'[show information about selected chroots]' \
        '--location[print location of selected chroots]' \
        '--config[dump configuration of selected chroots]' \
        '(-p --preserve-environment)'{-p,--preserve-environment}'[preserve user environment]' \
-       '(-o --option)'{-o,--option}'[set option]' \
+       '(-o --option)'{-o+,--option=}'[set option]:option key=value' \
        '(-q --quiet)'{-q,--quiet}'[quiet]' \
        '(-v --verbose)'{-v,--verbose}'[verbose]' \
        '(-V --version)'{-V,--version}'[version]' \
        '--automatic-session[begin, run and end a session automatically]' \
        '(-b --begin-session)'{-b,--begin-session}'[begin a session; returns a session ID]' \
        '(-r --run-session)'{-r,--run-session}'[run an existing session]' \
-       '(-n --session-name)'{-n,--session-name}'[session name]' \
+       '(-n --session-name)'{-n+,--session-name=}'[session name]:session name' \
        '--recover-session[recover an existing session]' \
        '(-e --end-session)'{-e,--end-session}'[end an existing session]' \
        '(-f --force)'{-f,--force}'[force operation]' \

Completion/Unix/Command/_fortune

@@ -12,4 +12,4 @@ _arguments -S \
   '-s[short apothegms only]' \
   '-i[ignore case for -m patterns]' \
   '-w[wait before termination for a time based on msg length]' \
-  '*:databases:_values -S " " "fortune db" /usr/share/games/fortunes/*(N:r:t)'
+  '*:fortune db:_files -W /usr/share/games/fortunes -g "*(.:r)"'

Completion/Unix/Command/_smartmontools

@@ -9,14 +9,14 @@ _arguments -s -S \
     "w[print all words]"
     "(b v)n[suppress printing bits]"
     "(b n)v[print all bits from valid words]"' \
-  '-j[output as json]' \
-  '--json=[output in various json formats or yaml]: : _values -S "" "output format"
+  '(--json)-j[output as JSON]' \
+  '(-j)--json=-[specify JSON/YAML output format]: : _values -S "" "output format"
     "(b v)c[compact]"
     "(b v)g[grep/gron]"
     "(b v)o[original]"
     "(b v)s[sorted]"
     "(b v)v[verbose]"
-    "(b v)y[yaml]"
+    "(b v)y[YAML]"
     "(b v)i[implemented dev]"
     "(b v)u[unimplemented dev]"' \
   '(H)*'{-g+,--get=}'[get device setting]:setting:(all aam apm lookahead security wcache rcache wcreorder)' \

Completion/Unix/Command/_zfs

@@ -1083,7 +1083,7 @@ case $service:$words[1] in
   zpool:iostat)
     if [[ $implementation = openzfs ]]; then
       args=(
-        '-c+[run scripts on each vdev]: :_values -s , "scriptname" $scriptnames'
+        '-c+[run scripts on each vdev]: :_values -s , "script name" $scriptnames'
         '-g[display vdev GUIDs instead of normal device names]'
         '-H[suppress headers and tab-delimit fields]'
         '-L[display real paths for vdevs resolving all symbolic links]'
@@ -1252,7 +1252,7 @@ case $service:$words[1] in
       args=(
         '--power[display vdev enclosure slot power status]'
         '-D[display a histogram of deduplication statistics]'
-        '-c+[run scripts on each vdev]: :_values -s , "scriptname" $scriptnames'
+        '-c+[run scripts on each vdev]: :_values -s , "script name" $scriptnames'
         '-e[only show unhealthy vdevs]'
         '-i[display vdev initialization status]'
         '-g[display vdev GUIDs instead of the normal device names]'