bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: fix initialization when extracting arrays

Browse source 
Assuming that everything is a string leads to code which is effectively:

  a=
  a+=('bar')

This creates an array with 2 elements instead of one. Using proper array
initialization fixes this.

https://lists.archlinux.org/pipermail/pacman-dev/2018-June/022591.html
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dave Reisner 2018-06-09 15:24:42 -04:00 • committed by Allan McRae
parent 5cf6f614eb
commit a92a36070a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/libmakepkg/util/pkgbuild.sh.in
View file

@ -106,7 +106,11 @@ get_pkgbuild_attribute() {
local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4 local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4
printf -v "$outputvar" %s '' if (( isarray )); then
eval "$outputvar=()"
else
printf -v "$outputvar" %s ''
fi
if [[ $pkgname ]]; then if [[ $pkgname ]]; then
extract_global_variable "$attrname" "$isarray" "$outputvar" extract_global_variable "$attrname" "$isarray" "$outputvar"