diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-04-24 23:04:42 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-04-24 23:04:42 -0400 |
| commit | ece0c6165cc38a5149e21f02df3b545ce3f30f25 (patch) | |
| tree | 1e577fb9ef5634ff2f3db884e008e3b7843685af | |
| parent | f0ad4bdf7ea3e7b3ac2c64d27a57a9bbf4f693c9 (diff) | |
makepkg.conf: use librelib conf to get the user and home directory.
It wasn't handling this nesting correctly:
autobuilder -> libremakepkg(root) -> pkgbuild-check-nonfree
| -rw-r--r-- | .config/pacman/makepkg.conf | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.config/pacman/makepkg.conf b/.config/pacman/makepkg.conf index 98b1536..477fe8e 100644 --- a/.config/pacman/makepkg.conf +++ b/.config/pacman/makepkg.conf @@ -1,12 +1,13 @@ -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" +. "$(librelib conf)" +PKGDEST="${LIBREHOME}/packages/pkgdest" +SRCDEST="${LIBREHOME}/packages/srcdest" +SRCPKGDEST="${LIBREHOME}/packages/srcpkgdest" +LOGDEST="${LIBREHOME}/packages/logdest" +BUILDDIR="${LIBREHOME}/packages/builddir" GPGKEY="$({ [ -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 -nr 's/^\s*default-key\s+//p' "${LIBREHOME}/.gnupg/gpg.conf" + sudo -u "${LIBREUSER}" gpg --list-secret-keys --with-colons | awk -F: '/^sec:/{print substr($5,9)}' } | sed 1q)" -PACKAGER="$(sudo -u "${LIBREUSER:-$USER}" gpg --with-colons --fingerprint "$GPGKEY" | awk -F: '/^uid:/{print $10}')" +PACKAGER="$(sudo -u "${LIBREUSER}" gpg --with-colons --fingerprint "$GPGKEY" | awk -F: '/^uid:/{print $10}')" |