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/pkgdelta.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts/pkgdelta.sh.in') diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index fe63974d..9f87185b 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -28,6 +28,12 @@ export TEXTDOMAINDIR='@localedir@' declare -r myver='@PACKAGE_VERSION@' +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +# Import parseopts.sh +source "$LIBRARY"/util/parseopts.sh + +# Options QUIET=0 USE_COLOR='y' @@ -41,7 +47,6 @@ max_delta_size=70 # ensure we have a sane umask set umask 0022 -m4_include(library/parseopts.sh) m4_include(library/output_format.sh) # print usage instructions -- cgit v1.2.3-24-g4f1b