guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: openssh: Install ssh-copy-id.


From: Ricardo Wurmus
Subject: 02/02: gnu: openssh: Install ssh-copy-id.
Date: Mon, 30 Nov 2015 13:59:17 +0000

rekado pushed a commit to branch master
in repository guix.

commit 36f26211bbb2c4dffe33427d4e65d5225a586a5b
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Nov 27 11:35:50 2015 +0100

    gnu: openssh: Install ssh-copy-id.
    
    * gnu/packages/ssh.scm (openssh)[arguments]: Install "ssh-copy-id" and
      documentation.
    
    Fixes <http://bugs.gnu.org/22024>.
    Reported by Florian Paul Schmidt <address@hidden>.
---
 gnu/packages/ssh.scm |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 26729ea..5c222a2 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -145,9 +145,19 @@ a server that supports the SSH-2 protocol.")
               (string-append pre post)))
            #t))
         (replace 'install
-         (lambda* (#:key (make-flags '()) #:allow-other-keys)
+         (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
            ;; install without host keys and system configuration files
-           (zero? (apply system* "make" "install-nosysconf" make-flags)))))))
+           (and (zero? (apply system* "make" "install-nosysconf" make-flags))
+                (begin
+                  (install-file "contrib/ssh-copy-id"
+                                (string-append (assoc-ref outputs "out")
+                                               "/bin/"))
+                  (chmod (string-append (assoc-ref outputs "out")
+                                        "/bin/ssh-copy-id") #o555)
+                  (install-file "contrib/ssh-copy-id.1"
+                                (string-append (assoc-ref outputs "out")
+                                               "/share/man/man1/"))
+                  #t)))))))
    (synopsis "Client and server for the secure shell (ssh) protocol")
    (description
     "The SSH2 protocol implemented in OpenSSH is standardised by the



reply via email to

[Prev in Thread] Current Thread [Next in Thread]