root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[mkchrootpkg] check gpg keys again

Browse source
This commit is contained in:
Philip 2018-05-31 18:47:05 +02:00
parent 96a3b52670
commit 72a1ae0722
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/mkchrootpkg.in
View file

@ -19,7 +19,7 @@ import ${LIBDIR}/util.sh
shopt -s nullglob
makepkg_args=(-s --skipinteg --noconfirm -L)
makepkg_args=(-s --noconfirm -L)
repack=false
update_first=false
clean_first=false
@ -198,6 +198,11 @@ prepare_chroot() {
$install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
for x in .gnupg/pubring.{kbx,gpg}; do
[[ -r $USER_HOME/$x ]] || continue
$install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
done
sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
"MAKEFLAGS='$MAKEFLAGS'" "PACKAGER='$PACKAGER'"