diff options
| author | Alad Wenter <alad@archlinux.info> | 2016-10-10 10:47:38 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-10-22 12:50:54 +0200 |
| commit | 1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee (patch) | |
| tree | 209a9b9e48a558b8b75ff062e4f86d86cb29df95 /scripts/pacman-key.sh.in | |
| parent | dfc78129be7acaa0ebe71fe407d63b5141c10150 (diff) | |
| download | pacman-1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee.tar.gz pacman-1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee.tar.xz | |
makepkg: Move parseopts from library to libmakepkg
parseopts is used in makepkg and other scripts such as pacman-key as a
getopt replacement.
Instead of including it in those scripts via a macro, move it to
libmakepkg/util/parseopts.sh and have scripts source this file where
appropriate.
To keep the parseopts test, a new variable was introduced:
PM_LIBMAKEPKG_DIR
Signed-off-by: Alad Wenter <alad@archlinux.info>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/pacman-key.sh.in')
| -rw-r--r-- | scripts/pacman-key.sh.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ffefc68c..81bea0be 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -26,6 +26,11 @@ export TEXTDOMAINDIR='@localedir@' declare -r myver="@PACKAGE_VERSION@" +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +# Import parseopts.sh +source "$LIBRARY"/util/parseopts.sh + # Options ADD=0 DELETE=0 @@ -50,8 +55,6 @@ DEFAULT_KEYSERVER='hkp://pool.sks-keyservers.net' m4_include(library/output_format.sh) -m4_include(library/parseopts.sh) - usage() { printf "pacman-key (pacman) %s\n" ${myver} echo |