From 1262e8b12213a380aa2bb802f8b43ac53337b431 Mon Sep 17 00:00:00 2001 From: Trevor Arjeski Date: Mon, 6 May 2024 09:00:59 +0300 Subject: guix-install.sh: Add ~/.guix-profile/share/info to INFOPATH. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding ~/.guix-profile/share/info to the INFOPATH env var so that when a user does `guix install [package]` that package's info pages can be found. * etc/guix-install.sh (sys_create_init_profile): Add $GUIX_PROFILE/share/info to INFOPATH in ‘/etc/profile.d/zzz-guix.sh’. Signed-off-by: Ludovic Courtès Change-Id: I8958261c388ddee5659f0f1ce1c0c9813dc0f052 --- etc/guix-install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 82accfd5d5..4e268a52d6 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -626,11 +626,6 @@ export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" # _GUIX_PROFILE: `guix pull` profile _GUIX_PROFILE="$HOME/.config/guix/current" 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 -# When INFOPATH is unset, add a trailing colon so that Emacs -# searches 'Info-default-directory-list'. -export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH" # GUIX_PROFILE: User's default profile and home profile GUIX_PROFILE="$HOME/.guix-profile" @@ -638,6 +633,12 @@ GUIX_PROFILE="$HOME/.guix-profile" [ -L "$GUIX_PROFILE" ] && \ GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH" +# Export INFOPATH so that the updated info pages can be found +# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info +# When INFOPATH is unset, add a trailing colon so that Emacs +# searches 'Info-default-directory-list'. +export INFOPATH="$_GUIX_PROFILE/share/info:$GUIX_PROFILE/share/info:$INFOPATH" + GUIX_PROFILE="$HOME/.guix-home/profile" [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" [ -L "$GUIX_PROFILE" ] && \ -- cgit v1.2.3