zsh-workers
 help / color / mirror / code / Atom feed
From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: fix some syntax depending on shortloops
Date: Wed, 27 Jul 2011 11:11:00 +0200	[thread overview]
Message-ID: <1311757860-30180-1-git-send-email-mikachu@gmail.com> (raw)

Shortloops isn't in _comp_options so completions can't depend on it
being set. I discovered these two after updating my root .zshrc.

I haven't tested _ethtool but it should be fine, it looks like it just
had broken syntax that happened to work with shortloops set.

---
 Completion/Linux/Command/_ethtool     |    8 ++++----
 Completion/Zsh/Type/_file_descriptors |    4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Completion/Linux/Command/_ethtool b/Completion/Linux/Command/_ethtool
index a01d388..5d60774 100644
--- a/Completion/Linux/Command/_ethtool
+++ b/Completion/Linux/Command/_ethtool
@@ -3,9 +3,9 @@
 local -a cmds
 
 if [[ $CURRENT -ge 4 ]]; then
-	case $words[CURRENT-1]; in
+	case $words[CURRENT-1] in
 	  rx|tx)
-		if [[ $words[2] = '-G' ]] && _message -e n 'number of ring entries' || _wanted -x onoff expl 'enabled' compadd off on
+		[[ $words[2] = '-G' ]] && _message -e n 'number of ring entries' || _wanted -x onoff expl 'enabled' compadd off on
 	  ;;
 	  autoneg|adaptive-rx|adaptive-tx|raw|hex|sg|tso|ufo|gso)
 		_wanted -x onoff expl 'enabled' compadd off on
@@ -55,7 +55,7 @@ if [[ $CURRENT -ge 4 ]]; then
 		_wanted files expl 'raw register dump files' _files
 	  ;;
 	  *)
-	case $words[2]; in
+	case $words[2] in
 	  -A|--pause)
 		_values -S ' ' -w 'pause options' \
 			'autoneg[specify if pause autonegotiation is enabled]' \
@@ -111,7 +111,7 @@ if [[ $CURRENT -ge 4 ]]; then
 			'gso[specify if generic segmentation offload is enabled]'
 	  ;;
 	  -p|--identify)
-		if [[ $CURRENT -eq 4 ]] && _message -e length 'seconds'
+		[[ $CURRENT -eq 4 ]] && _message -e length 'seconds'
 	  ;;
 	  -t|--test)
 		_values -S ' ' -w 'selftest option' \
diff --git a/Completion/Zsh/Type/_file_descriptors b/Completion/Zsh/Type/_file_descriptors
index 1dac47f..3e251b7 100644
--- a/Completion/Zsh/Type/_file_descriptors
+++ b/Completion/Zsh/Type/_file_descriptors
@@ -13,7 +13,9 @@ if zstyle -T ":completion:${curcontext}:" verbose && [[ -h /proc/$$/fd/$fds[1] ]
       list+=( "$i $sep ${link[1]}" )
     done
   elif (( $+commands[readlink] )); then
-    for i in "${fds[@]}"; list+=( "$i $sep $(readlink /proc/$$/fd/$i)" )
+    for i in "${fds[@]}"; do
+      list+=( "$i $sep $(readlink /proc/$$/fd/$i)" )
+    done
   else
     for i in "${fds[@]}"; do
       list+=( "$i $sep $(ls -l /proc/$$/fd/$i|sed 's/.*-> //' )" )
-- 
1.7.5.4


             reply	other threads:[~2011-07-27  9:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-27  9:11 Mikael Magnusson [this message]
2011-07-27  9:48 ` Peter Stephenson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1311757860-30180-1-git-send-email-mikachu@gmail.com \
    --to=mikachu@gmail.com \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).