Browse Source

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.
gn-latest-20200428
Ludovic Courtès 3 years ago
parent
commit
d1d72830f2
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 8
      guix/scripts/pull.scm

8
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)

Loading…
Cancel
Save