05/06: system: Move ~/.config/guix/current first in PATH and INFOPATH.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 8d09bfe21870c2d5fdb1cd04bc5fdcab177204b0
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jun 12 15:04:52 2018 +0200

    system: Move ~/.config/guix/current first in PATH and INFOPATH.
    
    Fixes <https://bugs.gnu.org/31770>.
    Reported by address@hidden (宋文武).
    
    * gnu/system.scm (operating-system-etc-service)["profile"]: Arrange so
    that ~/.config/guix/current comes first in PATH and INFOPATH.
---
 gnu/system.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index e6118d3..7cb12a8 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -602,7 +602,7 @@ directory."
 # because they would require combining both profiles.
 # FIXME: See <http://bugs.gnu.org/20255>.
 export 
MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/man
-export 
INFOPATH=$HOME/.config/guix/current/share/info:$HOME/.guix-profile/share/info:/run/current-system/profile/share/info
+export 
INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info
 export 
XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share
 export 
XDG_CONFIG_DIRS=$HOME/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg
 
@@ -630,7 +630,8 @@ then
   export `cat /etc/environment | cut -d= -f1`
 fi
 
-for profile in \"$HOME/.config/guix/current\" \"$HOME/.guix-profile\"
+# Arrange so that ~/.config/guix/current comes first.
+for profile in \"$HOME/.guix-profile\" \"$HOME/.config/guix/current\"
 do
   if [ -f \"$profile/etc/profile\" ]
   then
@@ -644,6 +645,9 @@ do
   fi
 done
 
+# Arrange so that ~/.config/guix/current/share/info comes first.
+export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"
+
 # Set the umask, notably for users logging in via 'lsh'.
 # See <http://bugs.gnu.org/22650>.
 umask 022