[arch-commits] Commit in gnupg/trunk (PKGBUILD gnupg.install install)

[Jan Steffens]

    Date: Tuesday, May 30, 2017 @ 08:45:40
  Author: heftig
Revision: 296744

Enable sockets by default

Added:
  gnupg/trunk/gnupg.install
    (from rev 296743, gnupg/trunk/install)
Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/install

---------------+
 PKGBUILD      |    2 +-
 gnupg.install |   25 +++++++++++++++++++++++++
 install       |   10 ----------
 3 files changed, 26 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-30 08:19:18 UTC (rev 296743)
+++ PKGBUILD	2017-05-30 08:45:40 UTC (rev 296744)
@@ -24,7 +24,7 @@
 sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
             'SKIP')
 
-install=install
+install=gnupg.install
 
 conflicts=('dirmngr' 'gnupg2')
 provides=('dirmngr' "gnupg2=${pkgver}")

Copied: gnupg/trunk/gnupg.install (from rev 296743, gnupg/trunk/install)
===================================================================
--- gnupg.install	                        (rev 0)
+++ gnupg.install	2017-05-30 08:45:40 UTC (rev 296744)
@@ -0,0 +1,25 @@
+_global_units() {
+	systemctl --global $1 dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket
+}
+
+post_install() {
+	# See FS#42798 and FS#47371
+	dirmngr </dev/null &>/dev/null
+
+	# Let systemd supervise daemons by default
+	_global_units enable
+}
+
+post_upgrade() {
+	if (( $(vercmp $2 2.1.13-1) < 0 )); then
+		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
+	fi
+
+	if (( $(vercmp $2 2.1.21-2) < 0 )); then
+		_global_units enable
+	fi
+}
+
+pre_remove() {
+	_global_units disable
+}

Deleted: install
===================================================================
--- install	2017-05-30 08:19:18 UTC (rev 296743)
+++ install	2017-05-30 08:45:40 UTC (rev 296744)
@@ -1,10 +0,0 @@
-post_install() {
-	# See FS#42798 and FS#47371
-	dirmngr </dev/null &>/dev/null || true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
-		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
-	fi
-}