From 1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee Mon Sep 17 00:00:00 2001 From: Alad Wenter Date: Mon, 10 Oct 2016 10:47:38 +0200 Subject: 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 Signed-off-by: Allan McRae --- scripts/pacman-db-upgrade.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/pacman-db-upgrade.sh.in') diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 79e1c590..2bf444e1 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -30,7 +30,10 @@ declare -r myver='@PACKAGE_VERSION@' m4_include(library/output_format.sh) -m4_include(library/parseopts.sh) +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +# Import parseopts.sh +source "$LIBRARY"/util/parseopts.sh usage() { printf "pacman-db-upgrade (pacman) %s\n" "${myver}" -- cgit v1.2.3-24-g4f1b