guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: Add semicolon in commands that set GUIX_PROFILE.


From: Ludovic Courtès
Subject: 02/02: Add semicolon in commands that set GUIX_PROFILE.
Date: Mon, 20 Nov 2017 12:43:16 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit bd7e136d295f0d6c1aa5d107356e28c259a54cb9
Author: Ludovic Courtès <address@hidden>
Date:   Mon Nov 20 18:41:47 2017 +0100

    Add semicolon in commands that set GUIX_PROFILE.
    
    Fixes <https://bugs.gnu.org/28223>.
    Reported by Rosebud Uplink <address@hidden>.
    
    * doc/guix.texi (Binary Installation): Add missing semicolon after
    'GUIX_PROFILE=' line.
    (Invoking guix package): Likewise.
    * gnu/system.scm (operating-system-etc-service)[profile]: Likewise.
    * guix/build/profiles.scm (build-etc/profile): Likewise.
---
 doc/guix.texi           | 4 ++--
 gnu/system.scm          | 4 ++--
 guix/build/profiles.scm | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index d4a2a69..4f8453e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -456,7 +456,7 @@ Source @file{etc/profile} to augment @code{PATH} and other 
relevant
 environment variables:
 
 @example
-# GUIX_PROFILE=$HOME/.guix-profile \
+# GUIX_PROFILE=$HOME/.guix-profile ; \
   source $GUIX_PROFILE/etc/profile
 @end example
 
@@ -1684,7 +1684,7 @@ Files,,, bash, The GNU Bash Reference Manual}) so that 
newly-spawned
 shells get all the right environment variable definitions:
 
 @example
-GUIX_PROFILE="$HOME/.guix-profile" \
+GUIX_PROFILE="$HOME/.guix-profile" ; \
 source "$HOME/.guix-profile/etc/profile"
 @end example
 
diff --git a/gnu/system.scm b/gnu/system.scm
index 9e05c4b..7466ed7 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -588,7 +588,7 @@ export 
XCURSOR_PATH=$HOME/.icons:$HOME/.guix-profile/share/icons:/run/current-sy
 unset PATH
 
 # Load the system profile's settings.
-GUIX_PROFILE=/run/current-system/profile \\
+GUIX_PROFILE=/run/current-system/profile ; \\
 . /run/current-system/profile/etc/profile
 
 # Prepend setuid programs.
@@ -608,7 +608,7 @@ fi
 if [ -f \"$HOME/.guix-profile/etc/profile\" ]
 then
   # Load the user profile's settings.
-  GUIX_PROFILE=\"$HOME/.guix-profile\" \\
+  GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\
   . \"$HOME/.guix-profile/etc/profile\"
 else
   # At least define this one so that basic things just work
diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm
index 5c96fe9..b4160fb 100644
--- a/guix/build/profiles.scm
+++ b/guix/build/profiles.scm
@@ -82,7 +82,7 @@ definitions for all the SEARCH-PATHS."
 # for this profile.  You may want to define the 'GUIX_PROFILE' environment
 # variable to point to the \"visible\" name of the profile, like this:
 #
-#  GUIX_PROFILE=/path/to/profile \\
+#  GUIX_PROFILE=/path/to/profile ; \\
 #  source /path/to/profile/etc/profile
 #
 # When GUIX_PROFILE is undefined, the various environment variables refer



reply via email to

[Prev in Thread] Current Thread [Next in Thread]