04/08: doc: cookbook: Account for ‘guix pull’ in /etc/profile instructions.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 176e2eda7fd41ba0e6f3e1c3bb2f6aaea21bc822
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Mar 19 16:57:23 2024 +0100

    doc: cookbook: Account for ‘guix pull’ in /etc/profile instructions.
    
    * doc/guix-cookbook.texi (Setting Up Compute Nodes): Include
    $HOME/.config/guix/current.
    
    Change-Id: I6c1c42394991af8f1fa7c2630bdb4b0aef946c2b
---
 doc/guix-cookbook.texi | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index 2366c13caf..e7ef5fa784 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -22,7 +22,7 @@ Copyright @copyright{} 2020 André Batista@*
 Copyright @copyright{} 2020 Christine Lemmer-Webber@*
 Copyright @copyright{} 2021 Joshua Branson@*
 Copyright @copyright{} 2022, 2023 Maxim Cournoyer@*
-Copyright @copyright{} 2023 Ludovic Courtès@*
+Copyright @copyright{} 2023-2024 Ludovic Courtès@*
 Copyright @copyright{} 2023 Thomas Ieong
 
 Permission is granted to copy, distribute and/or modify this document
@@ -5299,14 +5299,17 @@ export LC_ALL
 For convenience, @code{guix package} automatically generates
 @file{~/.guix-profile/etc/profile}, which defines all the environment
 variables necessary to use the packages---@code{PATH},
-@code{C_INCLUDE_PATH}, @code{PYTHONPATH}, etc.  Thus it's a good idea to
-source it from @code{/etc/profile}:
+@code{C_INCLUDE_PATH}, @code{PYTHONPATH}, etc.  Likewise, @command{guix
+pull} does that under @file{~/.config/guix/current}.  Thus it's a good
+idea to source both from @code{/etc/profile}:
 
 @example
-GUIX_PROFILE="$HOME/.guix-profile"
-if [ -f "$GUIX_PROFILE/etc/profile" ]; then
-  . "$GUIX_PROFILE/etc/profile"
-fi
+for GUIX_PROFILE in "$HOME/.config/guix/current" "$HOME/.guix-profile"
+do
+  if [ -f "$GUIX_PROFILE/etc/profile" ]; then
+    . "$GUIX_PROFILE/etc/profile"
+  fi
+done
 @end example
 
 Last but not least, Guix provides command-line completion notably for