* PATCH: tar -C completion
@ 2003-02-26 13:14 Oliver Kiddle
0 siblings, 0 replies; only message in thread
From: Oliver Kiddle @ 2003-02-26 13:14 UTC (permalink / raw)
To: Zsh workers
This is a patch I've had around for a while. It improves tar completion
when the -C option is used but there is still plenty of room for further
improvement. I've been meaning to fix _tar more properly but haven't got
around to it.
Oliver
Index: Completion/Unix/Command/_tar
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_tar,v
retrieving revision 1.1
diff -u -r1.1 _tar
--- Completion/Unix/Command/_tar 2 Apr 2001 12:03:50 -0000 1.1
+++ Completion/Unix/Command/_tar 26 Feb 2003 10:26:13 -0000
@@ -13,7 +13,7 @@
# tar itself (GNU tar)
# - Things like --directory=... are also completed correctly.
-local _tar_cmd tf tmp tmpb del
+local _tar_cmd tf tmp tmpb del index
# First we collect in `_tar_cmd' single letter options describing what
# should be done with the archive and if it is compressed. This
@@ -95,24 +95,23 @@
'*=DIR*:directory:_files -/' \
'*=CONTROL*::version control:(t numbered nil existing never simple)'
-elif [[ ( CURRENT -gt 2 && "$words[CURRENT-1]" = -*f* &&
- "$words[CURRENT-1]" != --* && "$words[CURRENT-1]" != -*Cf* ) ||
- ( CURRENT -eq 3 && "$words[2]" = *f* && "$words[2]" != -* &&
- "$words[2]" != *Cf* ) ||
- ( CURRENT -gt 2 && "$words[CURRENT-2]" = -*Cf* &&
+elif [[ ( CURRENT -gt 2 && "$words[CURRENT-1]" = -[^C]#f* &&
+ "$words[CURRENT-1]" != --* ) ||
+ ( CURRENT -eq 3 && "$words[2]" = [^C]#f* && "$words[2]" != -* ) ||
+ ( CURRENT -gt 2 && "$words[CURRENT-2]" = -*C*f* &&
"$words[CURRENT-2]" != --* && "$words[CURRENT-1]" != --* ) ||
- ( CURRENT -eq 4 && "$words[2]" = *Cf* && "$words[2]" != -* ) ]]; then
+ ( CURRENT -eq 4 && "$words[2]" = *C*f* && "$words[2]" != -* ) ]]; then
# ...archive files if we think they are wanted here.
_tar_archive
-elif [[ ( CURRENT -gt 2 && "$words[CURRENT-1]" = -*Cf*) ||
- ( CURRENT -eq 3 && "$words[2]" = *Cf* ) ]]; then
+elif [[ ( CURRENT -gt 2 && "$words[CURRENT-1]" = -[^f]#C*) ||
+ ( CURRENT -eq 3 && "$words[2]" = [^f]#C* ) ]]; then
# a directory for -C
- _files -/
+ _directories
elif [[ ( "$_tar_cmd" = *[xt]* || -n $del ) && -n "$tf" ]]; then
@@ -145,6 +144,28 @@
fi
_wanted files expl 'file from archive' _multi_parts / _tar_cache_list
+elif (( CURRENT == 2 )); then
+ _values -s '' 'tar function' \
+ '(c t u x)A[append to and archive]' \
+ '(A t u x)c[create a new archive]' \
+ '(A c u x)t[list archive contents]' \
+ '(A c t x)u[update archive]' \
+ '(A c t u)x[extract files from an archive]' \
+ 'v[verbose output]' \
+ 'f[specify archive file or device]'
else
+ if ! (( index=$words[(I)-*C*] )); then
+ if [[ $words[2] = [^f]#C* ]]; then
+ index=1
+ elif [[ $words[2] = *f*C* ]]; then
+ index=2
+ fi
+ fi
+ if (( index )); then
+ index="$~words[index+1]"
+ [[ $index = (.|..|)/* ]] || index=~+/$index
+ _files -W $index
+ else
_files
+ fi
fi
Index: Completion/Unix/Type/_tar_archive
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_tar_archive,v
retrieving revision 1.1
diff -u -r1.1 _tar_archive
--- Completion/Unix/Type/_tar_archive 2 Apr 2001 11:41:59 -0000 1.1
+++ Completion/Unix/Type/_tar_archive 26 Feb 2003 10:26:13 -0000
@@ -13,7 +13,7 @@
_description files expl 'archive file'
-if [[ "$1" = *[tx]* ]]; then
+if [[ "$1" = *[urtx]* ]]; then
if [[ "$1" = *[zZ]* ]]; then
_files "$expl[@]" -g '*.((tar|TAR).(gz|GZ|Z)|tgz)'
elif [[ "$1" = *[Ijy]* ]]; then
This e-mail and any attachment is for authorised use by the intended recipient(s) only. It may contain proprietary material, confidential information and/or be subject to legal privilege. It should not be copied, disclosed to, retained or used by, any other party. If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender. Thank you.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-02-26 13:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-02-26 13:14 PATCH: tar -C completion Oliver Kiddle
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).