Date: Saturday, April 7, 2012 @ 14:02:58 Author: pierre Revision: 155852
Do not run pacman --init but ask the user to do so if needed Modified: archlinux-keyring/trunk/PKGBUILD archlinux-keyring/trunk/archlinux-keyring.install ---------------------------+ PKGBUILD | 6 +++--- archlinux-keyring.install | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-07 16:56:17 UTC (rev 155851) +++ PKGBUILD 2012-04-07 18:02:58 UTC (rev 155852) @@ -2,7 +2,7 @@ # Maintainer: Pierre Schmitz <[email protected]> pkgname=archlinux-keyring -pkgver=20120321 +pkgver=20120407 pkgrel=1 pkgdesc='Arch Linux PGP keyring' arch=('any') @@ -11,8 +11,8 @@ install="${pkgname}.install" source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"; "ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig";) -md5sums=('7a8f0b9b46f72b72bc9579ed1123c208' - '4411b733a7c3ab9abe0c2fc8cf2e53ec') +md5sums=('846e97918477f98046dcd1bd1dda9bda' + '87025603b192b87152e7e0e72c06aa72') package() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: archlinux-keyring.install =================================================================== --- archlinux-keyring.install 2012-04-07 16:56:17 UTC (rev 155851) +++ archlinux-keyring.install 2012-04-07 18:02:58 UTC (rev 155852) @@ -1,10 +1,14 @@ post_upgrade() { - pacman-key --populate archlinux + if usr/bin/pacman-key -l >/dev/null 2>&1; then + usr/bin/pacman-key --populate archlinux + else + echo " >>> Run \`pacman-key --init\` to set up your pacman keyring." + echo " >>> Then run \`pacman-key --populate archlinux\` to install the Arch Linux keyring." + fi } post_install() { - if which pacman-key >/dev/null 2>&1; then - pacman-key --init + if [ -x usr/bin/pacman-key ]; then post_upgrade fi }
