diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-24 22:44:51 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-24 22:44:51 +0200 |
| commit | ddb4062784c66ecc0c42910b209dc80356a197ea (patch) | |
| tree | d61154cfe888201707c2b4708bd6297ac371f0b0 /guix/scripts/pull.scm | |
| parent | 563ecba5cf1dac64818fa7c452fcb191ec28e0fd (diff) | |
| parent | dbe533292b2af2faad371c10bc9b3f03193f94b7 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/pull.scm')
| -rw-r--r-- | guix/scripts/pull.scm | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 3929cd402e..2d428546c9 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -203,6 +203,10 @@ true, display what would be built without actually building it." (define update-profile (store-lift build-and-use-profile)) + (define guix-command + ;; The 'guix' command before we've built the new profile. + (which "guix")) + (mlet %store-monad ((manifest (channel-instances->manifest instances))) (mbegin %store-monad (update-profile profile manifest @@ -211,17 +215,18 @@ true, display what would be built without actually building it." (munless dry-run? (return (newline)) (return (display-profile-news profile #:concise? #t)) - (match (which "guix") - (#f (return #f)) - (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 + (if guix-command + (let ((new (map (cut string-append <> "/bin/guix") + (list (user-friendly-profile profile) + profile)))) + ;; Is the 'guix' command previously in $PATH the same as the new + ;; one? If the answer is "no", then suggest 'hash guix'. + (unless (member guix-command new) + (display-hint (format #f (G_ "After setting @code{PATH}, run @command{hash guix} to make sure your shell refers to @file{~a}.") - (first new)))) - (return #f)))))))) + (first new)))) + (return #f)) + (return #f)))))) (define (honor-lets-encrypt-certificates! store) "Tell Guile-Git to use the Let's Encrypt certificates." |