03/03: pull: Suggest running 'hash guix' if needed.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 3bbd6919bd84b76686d1aa626ba861faf3fc8ceb
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jan 18 14:59:59 2019 +0100

    pull: Suggest running 'hash guix' if needed.
    
    Fixes <https://bugs.gnu.org/33647>.
    Suggested by Diego Nicola Barbato <address@hidden>.
    
    * guix/scripts/pull.scm (build-and-install): Before returning, display a
    hint if (which "guix") is not in PROFILE.
---
 guix/scripts/pull.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 513434c..d3a4401 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -34,11 +34,12 @@
   #:use-module (guix channels)
   #:autoload   (guix inferior) (open-inferior)
   #:use-module (guix scripts build)
+  #:autoload   (guix build utils) (which)
   #:use-module (guix git)
   #:use-module (git)
   #:use-module (gnu packages)
   #:use-module ((guix scripts package) #:select (build-and-use-profile))
-  #:use-module (gnu packages base)
+  #:use-module ((gnu packages base) #:select (canonical-package))
   #:use-module (gnu packages guile)
   #:use-module ((gnu packages bootstrap)
                 #:select (%bootstrap-guile))
@@ -191,7 +192,16 @@ true, display what would be built without actually 
building it."
                       #:hooks %channel-profile-hooks
                       #:dry-run? dry-run?)
       (munless dry-run?
-        (return (display-profile-news profile))))))
+        (return (display-profile-news profile))
+        (match (which "guix")
+          (#f (return #f))
+          (str
+           (let ((command (string-append profile "/bin/guix")))
+             (unless (string=? command str)
+               (display-hint (format #f (G_ "After setting @code{PATH}, run
address@hidden guix} to make sure your shell refers to @file{~a}.")
+                                     command)))
+             (return #f))))))))
 
 (define (honor-lets-encrypt-certificates! store)
   "Tell Guile-Git to use the Let's Encrypt certificates."