moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

makepkg: use less local variables in check_sanity

Browse Source 
Instead of declaring a new local variable for each loop in the
check_sanity() function, just reuse $i.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2010-08-05 21:35:54 +10:00 committed by Dan McGee
parent f04530eb61
commit 08e1d4764c
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/makepkg.sh.in
View File

@ -1186,9 +1186,8 @@ check_sanity() {
fi
done
local name
for name in "${pkgname[@]}"; do
if [[ ${name:0:1} = "-" ]]; then
for i in "${pkgname[@]}"; do
if [[ ${i:0:1} = "-" ]]; then
error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname"
return 1
fi
@ -1218,31 +1217,27 @@ check_sanity() {
fi
fi
local provide
for provide in ${provides[@]}; do
if [[ $provide != ${provide//</} || $provide != ${provide//>/} ]]; then
for i in ${provides[@]}; do
if [[ $i != ${i//</} || $i != ${i//>/} ]]; then
error "$(gettext "Provides array cannot contain comparison (< or >) operators.")"
return 1
fi
done
local file
for file in "${backup[@]}"; do
if [[ ${file:0:1} = "/" ]]; then
error "$(gettext "Backup entry should not contain leading slash : %s")" "$file"
for i in "${backup[@]}"; do
if [[ ${i:0:1} = "/" ]]; then
error "$(gettext "Backup entry should not contain leading slash : %s")" "$i"
return 1
fi
done
local optdepend
for optdepend in "${optdepends[@]}"; do
local pkg=${optdepend%%:*}
for i in "${optdepends[@]}"; do
local pkg=${i%%:*}
if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]*$ ]]; then
error "$(gettext "Invalid syntax for optdepend : '%s'")" "$optdepend"
error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i"
fi
done
local i
for i in 'changelog' 'install'; do
local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE")
local file
@ -1257,17 +1252,17 @@ check_sanity() {
done
local valid_options=1
local opt known kopt
for opt in ${options[@]}; do
local known kopt
for i in ${options[@]}; do
known=0
# check if option matches a known option or its inverse
for kopt in ${packaging_options[@]} ${other_options[@]}; do
if [[ ${opt} = ${kopt} || ${opt} = "!${kopt}" ]]; then
if [[ ${i} = ${kopt} || ${i} = "!${kopt}" ]]; then
known=1
fi
done
if (( ! known )); then
error "$(gettext "options array contains unknown option '%s'")" "$opt"
error "$(gettext "options array contains unknown option '%s'")" "$i"
valid_options=0
fi
done
@ -1275,19 +1270,18 @@ check_sanity() {
return 1
fi
local pkg
if (( ${#pkgname[@]} > 1 )); then
for pkg in ${pkgname[@]}; do
if ! declare -f package_${pkg} >/dev/null; then
error "$(gettext "missing package function for split package '%s'")" "$pkg"
for i in ${pkgname[@]}; do
if ! declare -f package_${i} >/dev/null; then
error "$(gettext "missing package function for split package '%s'")" "$i"
return 1
fi
done
fi
for pkg in ${PKGLIST[@]}; do
if ! in_array $pkg ${pkgname[@]}; then
error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDFILE"
for i in ${PKGLIST[@]}; do
if ! in_array $i ${pkgname[@]}; then
error "$(gettext "requested package %s is not provided in %s")" "$i" "$BUILDFILE"
return 1
fi
done