moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

lint_pkgbuild/variable: increase robustness

Browse Source 
Approach the detection of variables of the wrong type using an approach
similar to that used for construction of .SRCINFO files. While doing silly
things in bash could still result in false negatives, this approach should
be very robust to generatinf false positives results.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2015-11-13 13:48:30 +10:00
parent 663c74150a
commit 23f128ad5e
1 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
scripts/libmakepkg/lint_pkgbuild/variable.sh.in
View File

@ -24,7 +24,7 @@ LIBMAKEPKG_LINT_PKGBUILD_VARIABLE_SH=1
LIBRARY=${LIBRARY:-'@libmakepkgdir@'} LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
source "$LIBRARY/util/message.sh" source "$LIBRARY/util/message.sh"
source "$LIBRARY/util/pkgbuild.sh"
lint_pkgbuild_functions+=('lint_variable') lint_pkgbuild_functions+=('lint_variable')
@ -37,11 +37,16 @@ lint_variable() {
replaces sha1sums sha256sums sha384sums sha512sums source) replaces sha1sums sha256sums sha384sums sha512sums source)
local string=(changelog epoch install pkgdesc pkgrel pkgver url) local string=(changelog epoch install pkgdesc pkgrel pkgver url)
local i local i a v pkg keys out bad ret=0
for i in ${array[@]}; do
if grep -w -q -e "$i=[^(]" -e "$i+=[^(]" "$BUILDSCRIPT"; then # global variables
error "$(gettext "%s should be an array")" "$i" for i in ${array[@]} ${arch_array[@]}; do
ret=1 eval "keys=(\"\${!$i[@]}\")"
if (( ${#keys[*]} > 0 )); then
if [[ "$(declare -p $i)" != "declare -a "* ]]; then
error "$(gettext "%s should be an array")" "$i"
ret=1
fi
fi fi
done done
@ -49,17 +54,54 @@ lint_variable() {
[[ $a == "any" ]] && continue [[ $a == "any" ]] && continue
for i in ${arch_array[@]}; do for i in ${arch_array[@]}; do
if grep -w -q -e "$i_$a=[^(]" -e "$i_$a+=[^(]" "$BUILDSCRIPT"; then v="${i}_${a}"
error "$(gettext "%s_%s should be an array")" "$i" "$a" eval "keys=(\"\${!${v}[@]}\")"
ret=1 if (( ${#keys[*]} > 0 )); then
if [[ "$(declare -p $i)" != "declare -a "* ]]; then
error "$(gettext "%s_%s should be an array")" "$i" "$a"
ret=1
fi
fi fi
done done
done done
for i in ${string[@]}; do for i in ${string[@]}; do
if grep -w -q -e "$i=(" -e "$i+=(" "$BUILDSCRIPT"; then eval "keys=(\"\${!$i[@]}\")"
error "$(gettext "%s should not be an array")" "$i" if (( ${#keys[*]} > 0 )); then
ret=1 if [[ "$(declare -p $i)" == "declare -a "* ]]; then
error "$(gettext "%s should not be an array")" "$i"
ret=1
fi
fi fi
done done
# package function variables
for pkg in ${pkgname[@]}; do
for i in ${array[@]} ${arch_array[@]}; do
if extract_function_variable "package_$pkg" $i 0 out; then
error "$(gettext "%s should be an array")" "$i"
ret=1
fi
done
for a in ${arch[@]}; do
[[ $a == "any" ]] && continue
for i in ${arch_array[@]}; do
if extract_function_variable "package_$pkg" "${i}_${a}" 0 out; then
error "$(gettext "%s_%s should be an array")" "$i" "$a"
ret=1
fi
done
done
for i in ${string[@]}; do
if extract_function_variable "package_$pkg" $i 1 out; then
error "$(gettext "%s should not be an array")" "$i"
ret=1
fi
done
done
return $ret
} }