summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/Makefile.am1
-rw-r--r--scripts/libmakepkg/integrity/generate_checksum.sh.in1
-rw-r--r--scripts/libmakepkg/integrity/verify_checksum.sh.in1
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/variable.sh.in20
-rw-r--r--scripts/libmakepkg/util/meson.build1
-rw-r--r--scripts/libmakepkg/util/pkgbuild.sh.in2
-rw-r--r--scripts/libmakepkg/util/schema.sh.in49
-rw-r--r--scripts/makepkg.sh.in11
8 files changed, 64 insertions, 22 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 08fc34b2..0e5619bd 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -124,6 +124,7 @@ LIBMAKEPKG_IN = \
libmakepkg/util/option.sh \
libmakepkg/util/parseopts.sh \
libmakepkg/util/pkgbuild.sh \
+ libmakepkg/util/schema.sh \
libmakepkg/util/source.sh \
libmakepkg/util/util.sh
diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in
index 57ef46ff..63cdc4d6 100644
--- a/scripts/libmakepkg/integrity/generate_checksum.sh.in
+++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in
@@ -25,6 +25,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
source "$LIBRARY/util/message.sh"
source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
generate_one_checksum() {
local integ=$1 arch=$2 sources numsrc indentsz idx
diff --git a/scripts/libmakepkg/integrity/verify_checksum.sh.in b/scripts/libmakepkg/integrity/verify_checksum.sh.in
index 532e0693..ec61b16d 100644
--- a/scripts/libmakepkg/integrity/verify_checksum.sh.in
+++ b/scripts/libmakepkg/integrity/verify_checksum.sh.in
@@ -25,6 +25,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
source "$LIBRARY/util/message.sh"
source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
check_checksums() {
local integ a
diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in
index a975b024..512bed7b 100644
--- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in
@@ -25,22 +25,16 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
source "$LIBRARY/util/message.sh"
source "$LIBRARY/util/pkgbuild.sh"
+source "$LIBRARY/util/schema.sh"
lint_pkgbuild_functions+=('lint_variable')
lint_variable() {
- # TODO: refactor - similar arrays are used elsewhere
- local array=(arch backup groups license noextract options validpgpkeys)
- local arch_array=(checkdepends conflicts depends makedepends md5sums
- optdepends provides replaces sha1sums sha224sums
- sha256sums sha384sums sha512sums source)
- local string=(changelog epoch install pkgbase pkgdesc pkgrel pkgver url)
-
local i a pkg out bad ret=0
# global variables
- for i in ${array[@]} ${arch_array[@]}; do
+ for i in ${pkgbuild_schema_arrays[@]}; do
if declare -p $i > /dev/null 2>&1; then
if ! is_array $i; then
error "$(gettext "%s should be an array")" "$i"
@@ -52,7 +46,7 @@ lint_variable() {
for a in ${arch[@]}; do
[[ $a == "any" ]] && continue
- for i in ${arch_array[@]}; do
+ for i in ${pkgbuild_schema_arch_arrays[@]}; do
if declare -p "${i}_${a}" > /dev/null 2>&1; then
if ! is_array ${i}_${a}; then
error "$(gettext "%s should be an array")" "${i}_${a}"
@@ -62,7 +56,7 @@ lint_variable() {
done
done
- for i in ${string[@]}; do
+ for i in ${pkgbuild_schema_strings[@]}; do
if declare -p "$i" > /dev/null 2>&1; then
if is_array $i; then
error "$(gettext "%s should not be an array")" "$i"
@@ -73,7 +67,7 @@ lint_variable() {
# package function variables
for pkg in ${pkgname[@]}; do
- for i in ${array[@]} ${arch_array[@]}; do
+ for i in ${pkgbuild_schema_arrays[@]}; do
if extract_function_variable "package_$pkg" $i 0 out; then
error "$(gettext "%s should be an array")" "$i"
ret=1
@@ -83,7 +77,7 @@ lint_variable() {
for a in ${arch[@]}; do
[[ $a == "any" ]] && continue
- for i in ${arch_array[@]}; do
+ for i in ${pkgbuild_schema_arch_arrays[@]}; do
if extract_function_variable "package_$pkg" "${i}_${a}" 0 out; then
error "$(gettext "%s should be an array")" "${i}_${a}"
ret=1
@@ -91,7 +85,7 @@ lint_variable() {
done
done
- for i in ${string[@]}; do
+ for i in ${pkgbuild_schema_strings[@]}; do
if extract_function_variable "package_$pkg" $i 1 out; then
error "$(gettext "%s should not be an array")" "$i"
ret=1
diff --git a/scripts/libmakepkg/util/meson.build b/scripts/libmakepkg/util/meson.build
index b0e829c4..229b004d 100644
--- a/scripts/libmakepkg/util/meson.build
+++ b/scripts/libmakepkg/util/meson.build
@@ -7,6 +7,7 @@ sources = [
'option.sh.in',
'parseopts.sh.in',
'pkgbuild.sh.in',
+ 'schema.sh.in',
'source.sh.in',
'util.sh.in',
]
diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in
index b29229a3..0dc239d1 100644
--- a/scripts/libmakepkg/util/pkgbuild.sh.in
+++ b/scripts/libmakepkg/util/pkgbuild.sh.in
@@ -21,6 +21,8 @@
[[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return
LIBMAKEPKG_UTIL_PKGBUILD_SH=1
+source "$LIBRARY/util/schema.sh"
+
have_function() {
declare -f "$1" >/dev/null
diff --git a/scripts/libmakepkg/util/schema.sh.in b/scripts/libmakepkg/util/schema.sh.in
new file mode 100644
index 00000000..38f034e0
--- /dev/null
+++ b/scripts/libmakepkg/util/schema.sh.in
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# schema.sh - declare specific groups of pkgbuild variables
+#
+# Copyright (c) 2015-2018 Pacman Development Team <pacman-dev@archlinux.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[[ -n "$LIBMAKEPKG_SCHEMA_SH" ]] && return
+LIBMAKEPKG_SCHEMA_SH=1
+
+LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
+
+source "$LIBRARY/util/util.sh"
+
+
+known_hash_algos=({md5,sha{1,224,256,384,512}})
+
+pkgbuild_schema_arrays=(arch backup checkdepends conflicts depends groups
+ license makedepends noextract optdepends options
+ provides replaces source validpgpkeys
+ "${known_hash_algos[@]/%/sums}")
+
+pkgbuild_schema_strings=(changelog epoch install pkgbase pkgdesc pkgrel pkgver
+ url)
+
+pkgbuild_schema_arch_arrays=(checkdepends conflicts depends makedepends
+ optdepends provides replaces source
+ "${known_hash_algos[@]/%/sums}")
+
+pkgbuild_schema_package_overrides=(pkgdesc arch url license groups depends
+ optdepends provides conflicts replaces
+ backup options install changelog)
+
+readonly -a known_hash_algos pkgbuild_schema_arrays \
+ pkgbuild_schema_strings pkgbuild_schema_arch_arrays \
+ pkgbuild_schema_package_overrides
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[@]}\")"
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-21 20:48:37 +0000