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.master
parent
3a8c4860fb
commit
d1d72830f2
|
@ -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)
|
||||
|
|
Reference in New Issue