me
/
guix
Archived
1
0
Fork 0
Code

Add semicolon in commands that set GUIX_PROFILE. 

Fixes <https://bugs.gnu.org/28223>.
Reported by Rosebud Uplink <Uplink.Introversion@outlook.com>.

* 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.
master
Ludovic Courtès 2017-11-20 18:41:47 +01:00
parent 4b1ba80cef
commit bd7e136d29
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -456,7 +456,7 @@ Source @file{etc/profile} to augment @code{PATH} and other relevant
environment variables: environment variables:
@example @example
# GUIX_PROFILE=$HOME/.guix-profile \ # GUIX_PROFILE=$HOME/.guix-profile ; \
source $GUIX_PROFILE/etc/profile source $GUIX_PROFILE/etc/profile
@end example @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: shells get all the right environment variable definitions:
@example @example
GUIX_PROFILE="$HOME/.guix-profile" \ GUIX_PROFILE="$HOME/.guix-profile" ; \
source "$HOME/.guix-profile/etc/profile" source "$HOME/.guix-profile/etc/profile"
@end example @end example

4
gnu/system.scm
View File

@ -588,7 +588,7 @@ export XCURSOR_PATH=$HOME/.icons:$HOME/.guix-profile/share/icons:/run/current-sy
unset PATH unset PATH
# Load the system profile's settings. # Load the system profile's settings.
GUIX_PROFILE=/run/current-system/profile \\ GUIX_PROFILE=/run/current-system/profile ; \\
. /run/current-system/profile/etc/profile . /run/current-system/profile/etc/profile
# Prepend setuid programs. # Prepend setuid programs.
@ -608,7 +608,7 @@ fi
if [ -f \"$HOME/.guix-profile/etc/profile\" ] if [ -f \"$HOME/.guix-profile/etc/profile\" ]
then then
# Load the user profile's settings. # Load the user profile's settings.
GUIX_PROFILE=\"$HOME/.guix-profile\" \\ GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\
. \"$HOME/.guix-profile/etc/profile\" . \"$HOME/.guix-profile/etc/profile\"
else else
# At least define this one so that basic things just work # At least define this one so that basic things just work

2
guix/build/profiles.scm
View File

@ -82,7 +82,7 @@ definitions for all the SEARCH-PATHS."
# for this profile. You may want to define the 'GUIX_PROFILE' environment # for this profile. You may want to define the 'GUIX_PROFILE' environment
# variable to point to the \"visible\" name of the profile, like this: # 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 # source /path/to/profile/etc/profile
# #
# When GUIX_PROFILE is undefined, the various environment variables refer # When GUIX_PROFILE is undefined, the various environment variables refer