From: Clint Adams <clint@zsh.org>
To: Oliver Kiddle <okiddle@yahoo.co.uk>
Cc: zsh-workers@sunsite.dk, david@debian.org
Subject: Re: PATCH: _ssh (scp)
Date: Tue, 5 Feb 2002 12:47:02 -0500 [thread overview]
Message-ID: <20020205174702.GA2325@dman.com> (raw)
In-Reply-To: <20020205102420.39912.qmail@web9304.mail.yahoo.com>
> It would be more consistent with normal file completion to add the
> files and directories together with the same tag and description.
> I'd also be tempted to setup separate display strings so that the * for
> executables, @ for symlinks etc are preserved in the file list.
This does that somewhat messily.
I intend to revert the bit where it checks PREFIX and in all cases
have it do an ls on the dirname.
However, I can't decide if it is better to
ls -a1F /dir (thereby getting all the dotfiles and potentially
respecting the local setting of GLOB_DOTS)
or
ls -d1F /dir/* (thereby respecting the remote setting of GLOB_DOTS or
equivalent)
Index: Completion/Unix/Command/_ssh
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_ssh,v
retrieving revision 1.7
diff -u -r1.7 _ssh
--- Completion/Unix/Command/_ssh 2002/02/04 18:44:23 1.7
+++ Completion/Unix/Command/_ssh 2002/02/05 17:35:42
@@ -1,18 +1,26 @@
#compdef ssh slogin=ssh scp ssh-add ssh-agent ssh-keygen
_remote_files () {
- # Rather than simple directory discrimination, there should be
- # coloring based on all the different ls -F classifiers.
- local expl remfiles
+ # There should be coloring based on all the different ls -F classifiers.
+ local expl remfiles remdispf remdispd
if zstyle -T ":completion:${curcontext}:" remote-access; then
- remfiles=(${(f)"$(ssh -a -x ${words[CURRENT]%:*} ls -d1F ${words[CURRENT]#*:}\* 2>/dev/null)"})
+ if [[ $options[globdots] == "on" ]] && [[ "$PREFIX" == */ || -z "$PREFIX" ]];
+ then
+ print ssh -a -x ${words[CURRENT]%:*} ls -a1F ${words[CURRENT]#*:}
+ remfiles=(${(f)"$(ssh -a -x ${words[CURRENT]%:*} ls -a1F ${words[CURRENT]#*:} 2>/dev/null)"})
+ else
+ remfiles=(${(f)"$(ssh -a -x ${words[CURRENT]%:*} ls -d1F ${words[CURRENT]#*:}\* 2>/dev/null)"})
+ fi
- _wanted files expl 'remote files' \
- compadd ${${remfiles:#*/}/[*=@|](#e)/}
+ remdispf=(${remfiles:#*/})
+ remdispd=(${(M)remfiles:#*/})
- _wanted dirs expl 'remote directories' \
- compadd -S/ ${${(M)remfiles:#*/}/\\/(#e)/}
+ _wanted files expl 'remote files and directories' \
+ compadd -d remdispf ${${remfiles:#*/}/[*=@|](#e)/}
+
+ _wanted files expl 'remote files and directories' \
+ compadd -S/ -d remdispd ${${(M)remfiles:#*/}/\\/(#e)/}
else
_message 'remote files'
fi
next prev parent reply other threads:[~2002-02-05 17:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-02-04 17:59 Clint Adams
2002-02-04 18:25 ` Bart Schaefer
2002-02-04 18:43 ` Clint Adams
2002-02-05 10:24 ` Oliver Kiddle
2002-02-05 17:47 ` Clint Adams [this message]
2002-02-05 18:08 ` Clint Adams
2002-02-05 18:38 ` Bart Schaefer
2002-02-06 16:43 ` Clint Adams
2002-02-06 16:59 ` Borsenkow Andrej
2002-02-06 18:12 ` The :h modifier Brass Lantern Enterprises
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=20020205174702.GA2325@dman.com \
--to=clint@zsh.org \
--cc=david@debian.org \
--cc=okiddle@yahoo.co.uk \
--cc=zsh-workers@sunsite.dk \
/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).