| index : devtools32 | |
| Archlinux32 fork of devtools | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | makechrootpkg.in | 9 |
diff --git a/makechrootpkg.in b/makechrootpkg.in index 466cb92..cc02547 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -153,10 +153,11 @@ prepare_chroot() { echo 'BUILDDIR="/build"' >> "$copydir/etc/makepkg.conf" fi - # Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo - if [[ -r "$USER_HOME/.gnupg/pubring.gpg" ]]; then - install -D "$USER_HOME/.gnupg/pubring.gpg" \ - "$copydir/build/.gnupg/pubring.gpg" + # Read .makepkg.conf and gnupg pubring + if [[ -r $USER_HOME/.gnupg/pubring.kbx ]]; then + install -D "$USER_HOME/.gnupg/pubring.kbx" "$copydir/build/.gnupg/pubring.kbx" + elif [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then + install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg" fi mkdir -p "$copydir/pkgdest" |