From f0ad4bdf7ea3e7b3ac2c64d27a57a9bbf4f693c9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 24 Apr 2017 19:42:19 -0400 Subject: Update: modern dbscripts mandates chroot building --- .config/pacman/makepkg.conf | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to '.config') diff --git a/.config/pacman/makepkg.conf b/.config/pacman/makepkg.conf index caad51b..98b1536 100644 --- a/.config/pacman/makepkg.conf +++ b/.config/pacman/makepkg.conf @@ -1,11 +1,12 @@ -PKGDEST="${HOME}/packages/pkgdest" -SRCDEST="${HOME}/packages/srcdest" -SRCPKGDEST="${HOME}/packages/srcpkgdest" -LOGDEST="${HOME}/packages/logdest" -BUILDDIR="${HOME}/packages/builddir" +PKGDEST="${LIBREHOME:-$HOME}/packages/pkgdest" +SRCDEST="${LIBREHOME:-$HOME}/packages/srcdest" +SRCPKGDEST="${LIBREHOME:-$HOME}/packages/srcpkgdest" +LOGDEST="${LIBREHOME:-$HOME}/packages/logdest" +BUILDDIR="${LIBREHOME:-$HOME}/packages/builddir" GPGKEY="$({ - sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf" - gpg --list-secret-keys --with-colons | grep ^sec: | cut -d: -f5 | sed -r 's/.*(........)$/\1/' + [ -z "$GPGKEY" ] || echo "$GPGKEY" + sed -nr 's/^\s*default-key\s+//p' "${LIBREHOME:-$HOME}/.gnupg/gpg.conf" + sudo -u "${LIBREUSER:-$USER}" gpg --list-secret-keys --with-colons | awk -F: '/^sec:/{print substr($5,9)}' } | sed 1q)" -PACKAGER="$(gpg --with-colons --fingerprint "$GPGKEY"|grep ^uid:|cut -d: -f10)" +PACKAGER="$(sudo -u "${LIBREUSER:-$USER}" gpg --with-colons --fingerprint "$GPGKEY" | awk -F: '/^uid:/{print $10}')" -- cgit v1.2.3