From bc85b127df622575988f8e760f72d608d0900a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 24 Jul 2016 22:15:54 +0200 Subject: [PATCH] gnu: gnupg@2.0: Add the 'gpg' and 'gpgv' commands. * gnu/packages/gnupg.scm (gnupg-2.0)[arguments]: Add 'rename-v2-commands' phase. --- gnu/packages/gnupg.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index ddb9bf161d..90b5c2d72e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -284,7 +284,20 @@ libskba (working with X.509 certificates and CMS data).") (lambda _ (substitute* "tests/openpgp/Makefile.in" (("/bin/sh") (which "bash"))) - #t))))))) + #t)) + (add-after 'install 'rename-v2-commands + (lambda* (#:key outputs #:allow-other-keys) + ;; Upstream suggests removing the trailing '2' from command names: + ;; . + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/bin") + (rename-file "gpgv2" "gpgv") + (rename-file "gpg2" "gpg") + + ;; Keep the old name around to ease transition. + (symlink "gpgv" "gpgv2") + (symlink "gpg" "gpg2") + #t))))))))) (define-public gnupg-1 (package (inherit gnupg)