diff options
author | Oliver Kiddle <opk@users.sourceforge.net> | 2003-11-14 11:56:52 +0000 |
---|---|---|
committer | Oliver Kiddle <opk@users.sourceforge.net> | 2003-11-14 11:56:52 +0000 |
commit | b58339667420ef41df027ce400979d602082072e (patch) | |
tree | fb332866dca1f0a6095f6ba3292b49837a035420 /Completion/Unix/Command/_rsync | |
parent | 18c6d88d2fa1ff8128edbd10274f7ddb41a9ef4e (diff) | |
download | zsh-b58339667420ef41df027ce400979d602082072e.tar.gz zsh-b58339667420ef41df027ce400979d602082072e.tar.xz zsh-b58339667420ef41df027ce400979d602082072e.zip |
19244: various completion function fixes and updates
Diffstat (limited to 'Completion/Unix/Command/_rsync')
-rw-r--r-- | Completion/Unix/Command/_rsync | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync index ee05f4841..55fe18d27 100644 --- a/Completion/Unix/Command/_rsync +++ b/Completion/Unix/Command/_rsync @@ -8,15 +8,15 @@ if [[ -prefix *::*/ ]]; then compset -P '*::*/' - remfiles=(${(f)"$(rsync ${words[CURRENT]%/*}/)"}) + remfiles=(${(f)"$(_call_program files rsync ${words[CURRENT]%/*}/)"}) remdispf=(${remfiles:#d*}) remdispd=(${(M)remfiles:#d*}) - _wanted files expl 'remote files and directories' \ + _wanted files expl 'remote file or directory' \ compadd -d remdispf ${remdispf##* } - _wanted files expl 'remote files and directories' \ + _wanted files expl 'remote file or directory' \ compadd -S/ -d remdispd ${remdispd##* } elif [[ -prefix 1 *:: ]]; then @@ -24,7 +24,7 @@ elif [[ -prefix 1 *:: ]]; then compset -P 1 '*::' - remfiles=(${(f)"$(rsync ${words[CURRENT]%::*}::)"}) + remfiles=(${(f)"$(_call_program files rsync ${words[CURRENT]%::*}::)"}) remmodules=(${remfiles/[ ]#/:}) @@ -37,17 +37,17 @@ elif [[ -prefix 1 *: ]]; then if zstyle -T ":completion:${curcontext}:" remote-access; then slash=/ - remfiles=(${(f)"$(ssh -a -x ${words[CURRENT]%:*} ls -d1F ${${${words[CURRENT + remfiles=(${(f)"$(_call_program files ssh -a -x ${words[CURRENT]%:*} ls -d1F ${${${words[CURRENT ]#*:}:h}/${slash}(#e)/}/\* 2>/dev/null)"}) remdispf=(${remfiles:#*/}) remdispd=(${(M)remfiles:#*/}) - _wanted files expl 'remote files and directories' \ - compadd -d remdispf ${${remfiles:#*/}/[*=@|](#e)/} + _wanted files expl 'remote file or directory' \ + compadd -d remdispf ${${remfiles:#*/}/[*=@|](#e)/} - _wanted files expl 'remote files and directories' \ - compadd -S/ -d remdispd ${${(M)remfiles:#*/}/${slash}(#e)/} + _wanted files expl 'remote file or directory' \ + compadd -S/ -d remdispd ${${(M)remfiles:#*/}/${slash}(#e)/} else _message -e remote-files 'remote files' fi @@ -65,14 +65,14 @@ else _wanted users expl "user" \ _combination -s '[:@]' "${tag}" users-hosts users -q "$@" - else - _alternative 'user:users:_users -S @' 'host:hosts:_hosts -S:' + _alternative 'users:user:_users -S @' 'hosts:host:_hosts -S:' fi fi } _rsync_files() { - _alternative "file:files:_files" "remote-files:remote files:_rsync_remote_files" + _alternative "files:file:_files" "remote-files:remote file:_rsync_remote_files" } _arguments -s \ |