From ba88c42a5b1ed3bd60ae0fe67a2b9267bafeaea2 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 10 Mar 2013 12:38:18 +0000 Subject: 30490: _java: -keystore takes a file argument, so complete files --- ChangeLog | 5 ++++- Completion/Unix/Command/_java | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46ba8dc71..d8d36720d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ sequences. This allows constructs like %F{%3v} to use $psvar[3] for the color. + * 30490: Completion/Unix/Command/_java: Complete files for the + -keystore argument. + 2013-03-05 Peter Stephenson * users/17666: Doc/Zsh/contrib.yo, Functions/Misc/zcalc: -f @@ -567,5 +570,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5813 $ +* $Revision: 1.5814 $ ***************************************************** diff --git a/Completion/Unix/Command/_java b/Completion/Unix/Command/_java index f6565bc64..7b1dce18f 100644 --- a/Completion/Unix/Command/_java +++ b/Completion/Unix/Command/_java @@ -229,7 +229,7 @@ keytool) '-keypass[password for private key]:password for private key:' \ '-validity[valid days]:number of days:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - import \ @@ -240,7 +240,7 @@ keytool) '-noprompt[disable interaction with the user]' \ '-trustcacerts[use cacerts]' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - selfcert \ @@ -251,14 +251,14 @@ keytool) '-validity[valid days]:number of days:' \ '-keypass[password for private key]:password for private key:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - identitydb \ '-identitydb[command to read identity database]' \ '-file[specify identity database file]:identity database file:_files' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - certreq \ @@ -268,7 +268,7 @@ keytool) '-file[specify certificate signing request file]:certificate signing request file:_files' \ '-keypass[password for private key]:password for private key:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - export \ @@ -277,14 +277,14 @@ keytool) '-file[specify certificate file]:certificate file:_files' \ '-rfc[make certificate format printable as RFC 1421]' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - list \ '-list[command to print keystore entry]' \ '-alias[alias]:alias:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '(-rfc)-v[make certificate format human-readable]' \ '(-v)-rfc[make certificate format printable as RFC 1421]' \ @@ -299,14 +299,14 @@ keytool) '-keypass[password for private key]:password for private key:' \ '-new[password for private key of new entry]:password for private key of new entry:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - storepasswd \ '-storepasswd[command to change password for keystore]' \ '-new[new password]:new password:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - keypasswd \ @@ -315,14 +315,14 @@ keytool) '-keypass[old password for private key]:old password for private key:' \ '-new[nwe password for private key]:new password for private key:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - delete \ '-delete[command to delete entry]' \ '-alias[alias]:alias:' \ '-storetype[keystore type]:store type:' \ - '-keystore[keystore location]:keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storepass[password for keystore]:password:' \ '-v[verbose mode]' \ - help \ @@ -331,7 +331,7 @@ keytool) jarsigner) _arguments \ - '-keystore[specify URL for keystore location]:URL for keystore location:' \ + '-keystore[keystore location]:keystore location:_files' \ '-storetype[specify keystore type]:store type:' \ '-storepass[specify password for keystore]:password:' \ '-keypass[specify password for private key]:password:' \ -- cgit 1.4.1