diff options
| author | Oliver Kiddle <opk@zsh.org> | 2015-05-03 16:53:47 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2015-05-03 16:53:57 +0200 |
| commit | ab7ec8d9851fea8230e1ccfba284c5bfaf457d88 (patch) | |
| tree | 837b14c838b96728ebdb530eb20d35737ef8419b /Completion/Unix/Type | |
| parent | b29278c69a67089ba225a98478069eb3f32ab4e6 (diff) | |
| download | zsh-ab7ec8d9851fea8230e1ccfba284c5bfaf457d88.tar.gz zsh-ab7ec8d9851fea8230e1ccfba284c5bfaf457d88.tar.xz zsh-ab7ec8d9851fea8230e1ccfba284c5bfaf457d88.zip | |
35011: update completions for some common Unix commands,
in particular improving FreeBSD support
Diffstat (limited to 'Completion/Unix/Type')
| -rw-r--r-- | Completion/Unix/Type/_diff_options | 13 | ||||
| -rw-r--r-- | Completion/Unix/Type/_file_systems | 15 |
2 files changed, 12 insertions, 16 deletions
diff --git a/Completion/Unix/Type/_diff_options b/Completion/Unix/Type/_diff_options index 472838cda..d76c265ca 100644 --- a/Completion/Unix/Type/_diff_options +++ b/Completion/Unix/Type/_diff_options @@ -103,17 +103,20 @@ if _pick_variant -c $cmd gnu=GNU unix -v; then else case $OSTYPE in solaris2.<9->) - args=( '(-c -e -f -C)-u[output a unified diff]' ) + args=( + '(-c -e -f -C -U)-u[output a unified diff]' + '(-c -e -f -C -u)-U[output a unified diff]:lines of context' + ) ;& solaris*) args+=( '-i[case insensitive]' '-t[expand tabs to spaces]' '-w[ignore all white space]' - '(-c -e -f -n -u -h -D)-C+[output a context diff]:number of lines of copied context' - '(-c -e -f -n -u -C -D)-h[do a fast, half-hearted job]' - '(-c -e -f -u -h -C -D)-n[reversed ed script]' - '(-c -e -f -n -u -h -C)-D[output merged file with preprocessor directives]:preprocessor symbol' + '(-c -e -f -n -u -U -h -D)-C+[output a context diff]:lines of context' + '(-c -e -f -n -u -U -C -D)-h[do a fast, half-hearted job]' + '(-c -e -f -u -U -h -C -D)-n[reversed ed script]' + '(-c -e -f -n -u -U -h -C)-D[output merged file with preprocessor directives]:preprocessor symbol' '-l[output through pr]' '-s[report on identical files]' '-S+[set first file in comparison]:start with file:_files' diff --git a/Completion/Unix/Type/_file_systems b/Completion/Unix/Type/_file_systems index 4fdeabeff..2d903d471 100644 --- a/Completion/Unix/Type/_file_systems +++ b/Completion/Unix/Type/_file_systems @@ -17,13 +17,14 @@ case $OSTYPE in osf*) fss=( advfs ufs nfs mfs cdfs ) ;; solaris*) fss=( ufs nfs hsfs s5fs pcfs cachefs tmpfs ) ;; dragonfly*) - fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdos nfs + fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdos nfs ntfs null nwfs portal procfs std udf ufs umap union ) ;; freebsd*) + fss=( ${${(f)"$(_call_program fstypes lsvfs)"}[3,-1]%% *} ) || fss=( cd9660 devfs ext2fs fdescfs kernfs linprocfs linsysfs mfs msdosfs nfs - ntfs nullfs nwfs portalfs procfs smbfs std udf ufs unionfs - reiserfs xfs) + ntfs nullfs nwfs portalfs procfs smbfs std tmpfs udf ufs unionfs + reiserfs xfs zfs ) ;; darwin*) fss=( afp cd9660 cddafs devfs fdesc hfs lfs msdos nfs @@ -36,11 +37,3 @@ case $OSTYPE in esac _wanted fstypes expl 'file system type' compadd "$@" -M 'L:|no=' -a "$@" - fss - - - - - - - - |