[pacman-dev] [PATCH] makepkg: use more schema.sh to clean the environment of special variables

Allan McRae allan at archlinux.org
Wed May 8 00:10:12 UTC 2019


On 1/4/19 2:51 am, Eli Schwartz wrote:
> Fixes "arch" and "checkdepends" never having been unset, fixes b2sums
> (but not ${!b2sums_@}) being recently left out.
> The "build" function used to be unset as well, explicitly unset it as a
> function and do the same for other official functions as well.
> 
> Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
> ---
>  scripts/makepkg.sh.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 9708a65e..7f1a03df 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1214,9 +1214,9 @@ else
>  	fi
>  fi
>  
> -unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides
> -unset md5sums replaces depends conflicts backup source install changelog build
> -unset sha{1,224,256,384,512}sums makedepends optdepends options noextract validpgpkeys
> +unset "${pkgbuild_schema_strings[@]}" "${pkgbuild_schema_arrays[@]}"
> +unset "${known_hash_algos[@]/%/sums}"
> +unset -f pkgver prepare build check package "${!package_@}"
>  unset "${!makedepends_@}" "${!depends_@}" "${!source_@}" "${!checkdepends_@}"
>  unset "${!optdepends_@}" "${!conflicts_@}" "${!provides_@}" "${!replaces_@}"
>  unset "${!md5sums_@}" "${!sha1sums_@}" "${!sha224sums_@}" "${!sha256sums_@}"
> 

No.


allan at kamala ~
$ pkgver=1

allan at kamala ~
$ unset -f pkgver

allan at kamala ~
$ echo $pkgver
1

allan at kamala ~
$ unset pkgver

allan at kamala ~
$ echo $pkgver


The unset of the ${!package_@} needs its own line if you really want the
-f there.

A


More information about the pacman-dev mailing list