From 6c870953c563c69c7e833637fec292e291511b45 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 9 Mar 2013 22:45:00 -0500 Subject: pkgdelta: fix improper passing of file argument Looks like I hosed this pretty hard in 5a5e712c749edb8. Signed-off-by: Dave Reisner Signed-off-by: Allan McRae --- scripts/pkgdelta.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index a6aad3f6..39046b87 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -75,6 +75,7 @@ isnumeric() { } read_pkginfo() { + unset pkgver pkgname arch while IFS='=' read -r field value; do # skip comments and invalid lines [[ $field = '#'* || -z $value ]] && continue @@ -82,10 +83,10 @@ read_pkginfo() { # skip lines which aren't fields we care about [[ $field != @(pkgver|pkgname|arch) ]] || continue - declare "$field=$value" + declare -g "${field% }=${value# }" [[ $pkgname && $pkgver && $arch ]] && return 0 - done + done < <(bsdtar -xOqf "$1" .PKGINFO 2>/dev/null) error "$(gettext "Invalid package file '%s'.")" "$1" return 1 -- cgit v1.2.3-70-g09d2