Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: two completion problems.
- X-seq: zsh-workers 23203
- From: Peter Stephenson <pws@xxxxxxx>
- To: Zsh hackers list <zsh-workers@xxxxxxxxxx>
- Subject: Re: two completion problems.
- Date: Thu, 01 Mar 2007 15:50:31 +0000
- In-reply-to: <20070301154455.GB2590@xxxxxxxxxxxxxxxxxxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <20070301141210.GA869@xxxxxxxxxxxxxxxxxxxxxxxxxx> <200703011522.l21FMBR7002839@xxxxxxxxxxxxxx> <20070301154455.GB2590@xxxxxxxxxxxxxxxxxxxxxxxxxx>
"Zvi Har'El" wrote:
> But the real question is: why don't use acroread -version
> instead of trying to read the file?
Indeed, I've folded that in as the default.
Index: Completion/X/Command/_acroread
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/X/Command/_acroread,v
retrieving revision 1.6
diff -u -r1.6 _acroread
--- Completion/X/Command/_acroread 26 Mar 2006 15:15:10 -0000 1.6
+++ Completion/X/Command/_acroread 1 Mar 2007 15:49:15 -0000
@@ -1,15 +1,29 @@
#compdef acroread
local curcontext="$curcontext" state line
+local cmdfile
-# Try extracting the version number directly from the executable.
-# (This will fail if the executable is a wrapper script for acroread.)
-local ver=${${${(Mf)"$(<$commands[$words[1]])"}:#ver=*}##ver=}
-[[ -n $ver ]] && _acroread_version=$ver
-
-if (( ! $+_acroread_version )); then
- local acropath=${${(s. .)${${(f)"$($words[1] -help 2>&1)"}[1]}}[2]}
- _acroread_version=${${${(Mf)"$(<$acropath)"}:#ver=*}##ver=}
+if [[ -z $_acroread_version ]]; then
+ _acroread_version="$($words[1] -version 2>/dev/null)"
+fi
+
+if [[ -z $_acroread_version ]]; then
+ if [[ $words[1] = */* && -x $words[1] ]]; then
+ cmdfile=$words[1]
+ elif [[ -x $commands[$words[1]] ]]; then
+ cmdfile=$commands[$words[1]]
+ fi
+
+ # Try extracting the version number directly from the executable.
+ # (This will fail if the executable is a wrapper script for acroread.)
+ _acroread_version=${${(M)${(f)"$(<$cmdfile)"}:#ver=*}##ver=}
+
+ if [[ -z $_acroread_version ]]; then
+ local acropath=${${(s. .)${${(f)"$($words[1] -help 2>&1)"}[1]}}[2]}
+ if [[ -r $acropath ]]; then
+ _acroread_version=${${(M)${(f)"$(<$acropath)"}:#ver=*}##ver=}
+ fi
+ fi
fi
if [[ $_acroread_version == 7.* ]]; then
--
Peter Stephenson <pws@xxxxxxx> Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070
To access the latest news from CSR copy this link into a web browser: http://www.csr.com/email_sig.php
To get further information regarding CSR, please visit our Investor Relations page at http://ir.csr.com/csr/about/overview
Messages sorted by:
Reverse Date,
Date,
Thread,
Author