From 75aae126c423dcc9b215aef57daff9e7bd8f5f6b Mon Sep 17 00:00:00 2001 From: morganamilo Date: Wed, 30 Jan 2019 18:07:20 +0000 Subject: libmakepkg: centralise random arrays of pkgbuild variables Refactor many of the different arrays of pkgbuild variables into scripts/libmakepkg/util/schema.sh.in. Signed-off-by: morganamilo Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'scripts/makepkg.sh.in') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 749d074a..5606f65b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -48,13 +48,6 @@ declare -r startdir="$(pwd -P)" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends' - 'optdepends' 'provides' 'conflicts' 'replaces' 'backup' - 'options' 'install' 'changelog') -readonly -a splitpkg_overrides - -known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') - # Options ASDEPS=0 BUILDFUNC=0 @@ -905,7 +898,7 @@ check_build_status() { backup_package_variables() { local var - for var in ${splitpkg_overrides[@]}; do + for var in ${pkgbuild_schema_package_overrides[@]}; do local indirect="${var}_backup" eval "${indirect}=(\"\${$var[@]}\")" done @@ -913,7 +906,7 @@ backup_package_variables() { restore_package_variables() { local var - for var in ${splitpkg_overrides[@]}; do + for var in ${pkgbuild_schema_package_overrides[@]}; do local indirect="${var}_backup" if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" -- cgit v1.2.3-54-g00ecf