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

[mkchrootpkg] sync with devtools

Browse source
This commit is contained in:
udeved 2015-02-28 23:20:12 +01:00
parent 282aa16857
commit 73e46fc0d2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/mkchrootpkg.in
View file

@ -189,9 +189,14 @@ prepare_chroot() {
fi fi
# Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo # Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo
if [[ -r "$USER_HOME/.gnupg/pubring.gpg" ]]; then # if [[ -r "$USER_HOME/.gnupg/pubring.gpg" ]]; then
install -D "$USER_HOME/.gnupg/pubring.gpg" \ # install -D "$USER_HOME/.gnupg/pubring.gpg" \
"$copydir/build/.gnupg/pubring.gpg" # "$copydir/build/.gnupg/pubring.gpg"
# fi
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 fi
mkdir -p "$copydir/pkgdest" mkdir -p "$copydir/pkgdest"