03/05: guix-install.sh: Export INFOPATH to contain updated guix info-pages

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 5c03516a6bc6bff69b99ec8d29a87603685f7041
Author: Prafulla Giri <address@hidden>
AuthorDate: Tue Jan 21 12:25:24 2020 +0545

    guix-install.sh: Export INFOPATH to contain updated guix info-pages
    
    * etc/guix-install.sh (sys_create_init_profile): Export INFOPATH to include
    the updated info-pages from ~/.config/guix/current/share/info.  This also 
makes
    sure that both /usr/bin/info and $GUIX_PROFILE/bin/info can read guix info 
pages
    without throwing "no menu item 'guix' in node dir(Top)" error.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 etc/guix-install.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index b57d719..ff97c78 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -398,7 +398,12 @@ sys_create_init_profile()
     cat <<"EOF" > /etc/profile.d/guix.sh
 # _GUIX_PROFILE: `guix pull` profile
 _GUIX_PROFILE="$HOME/.config/guix/current"
-[ -L $_GUIX_PROFILE ] && export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
+if [ -L $_GUIX_PROFILE ]; then
+  export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
+  # Export INFOPATH so that the updated info pages can be found
+  # and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
+  export INFOPATH="$_GUIX_PROFILE/share/info${INFOPATH:+:}$INFOPATH"
+fi
 
 # GUIX_PROFILE: User's default profile
 GUIX_PROFILE="$HOME/.guix-profile"