diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-04-07 17:54:02 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-07 18:03:48 +0200 |
| commit | 3c5d5a19b36c5ea3638de263cb7cd1be6289cb44 (patch) | |
| tree | 6b8d70b09046bb3bfb75fe720514892f0a78f87b /scripts/pacman-key.sh.in | |
| parent | 297916e6a2ad91bbd4cbd0173cac79937b93a393 (diff) | |
| download | pacman-3c5d5a19b36c5ea3638de263cb7cd1be6289cb44.tar.gz pacman-3c5d5a19b36c5ea3638de263cb7cd1be6289cb44.tar.xz | |
Revert "parseopts: normalize options into an array"
This was really only half a fix for FS#28445, as it still doesn't
correctly handle the case of filenames with spaces. In the short term,
there is no obvious fix for this. In the long term, I believe the
correct decision is to rewrite the options parser to be more in line
with GNU getopt_long.
This reverts commits:
ca4142714137b16feabac09c4cda86b0a75036f8.
969dcddbdf9d5dbd91aa414cdd193f3fb26b644b.
Diffstat (limited to 'scripts/pacman-key.sh.in')
| -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 278e3d6e..9a77a19f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -469,11 +469,11 @@ OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" OPT_LONG+=",help,import:,import-trustdb:,init,keyserver:,list-keys::,list-sigs::" OPT_LONG+=",lsign-key:,populate::,recv-keys:,refresh-keys::,updatedb" OPT_LONG+=",verify:,version" -if ! parse_options $OPT_SHORT $OPT_LONG "$@"; then +if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi -set -- "${OPTRET[@]}" -unset OPT_SHORT OPT_LONG OPTRET +eval set -- "$OPT_TEMP" +unset OPT_SHORT OPT_LONG OPT_TEMP if [[ $1 == "--" ]]; then usage; |