diff options
| author | Allan McRae <allan@archlinux.org> | 2011-07-06 03:41:52 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-07-19 10:27:53 +1000 |
| commit | b300b991a7c489731f7e30117be169f69ffb8745 (patch) | |
| tree | bc44e23ed260eab707a57524a533978823b3046f | |
| parent | 8ee0724558a33e224c06dddd63d6560d6e41cb44 (diff) | |
| download | pacman-b300b991a7c489731f7e30117be169f69ffb8745.tar.xz | |
pacman-key: allow the export of all key ids
The gpg --export will exprt all keys if none are specified. Replicate
this behavior in pacman-key.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/pacman-key.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 2561f91c..cf8c840e 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -51,7 +51,7 @@ usage() { echo "$(gettext "Options:")" echo "$(gettext " -a, --add [<file(s)>] Add the specified keys (empty for stdin)")" echo "$(gettext " -d, --delete <keyid(s)> Remove the specified keyids")" - echo "$(gettext " -e, --export <keyid(s)> Export the specified keyids")" + echo "$(gettext " -e, --export [<keyid(s)>] Export the specified or all keyids")" echo "$(gettext " -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids")" echo "$(gettext " -h, --help Show this help message and exit")" echo "$(gettext " -l, --list List keys")" @@ -210,7 +210,7 @@ if ! type gettext &>/dev/null; then fi OPT_SHORT="a::d:e:f::hlr:t:uV" -OPT_LONG="add::,config:,delete:,export:,finger::,gpgdir:,help,list" +OPT_LONG="add::,config:,delete:,export::,finger::,gpgdir:,help,list" OPT_LONG+=",receive:,reload,trust:,updatedb,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; @@ -228,7 +228,7 @@ while true; do -a|--add) ADD=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYFILES=($1) ;; --config) shift; CONFIG=$1 ;; -d|--delete) DELETE=1; shift; KEYIDS=($1) ;; - -e|--export) EXPORT=1; shift; KEYIDS=($1) ;; + -e|--export) EXPORT=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; -f|--finger) FINGER=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --gpgdir) shift; PACMAN_KEYRING_DIR=$1 ;; -l|--list) LIST=1 ;; |