04/07: pull: Don't trigger 'hash guix' hint needlessly.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit d1d72830f2d60b2853460c443081683ef2f7d5c4
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 28 23:03:38 2019 +0100

    pull: Don't trigger 'hash guix' hint needlessly.
    
    Previously if ~/.config/guix/current/bin was in $PATH, we'd still
    suggest to run 'hash guix' because we'd compare (which "guix") against
    /var/guix/profiles/per-user/….
    
    * guix/scripts/pull.scm (build-and-install): Check whether (which
    "guix") matches PROFILE or its user-friendly variant.
---
 guix/scripts/pull.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 41c7fb2..6cecf8c 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -197,11 +197,13 @@ true, display what would be built without actually 
building it."
         (match (which "guix")
           (#f (return #f))
           (str
-           (let ((command (string-append profile "/bin/guix")))
-             (unless (string=? command str)
+           (let ((new (map (cut string-append <> "/bin/guix")
+                           (list (user-friendly-profile profile)
+                                 profile))))
+             (unless (member str new)
                (display-hint (format #f (G_ "After setting @code{PATH}, run
 @command{hash guix} to make sure your shell refers to @file{~a}.")
-                                     command)))
+                                     (first new))))
              (return #f))))))))
 
 (define (honor-lets-encrypt-certificates! store)