~ruther/guix-local

bd7e136d295f0d6c1aa5d107356e28c259a54cb9 — Ludovic Courtès 8 years ago 4b1ba80
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.
3 files changed, 5 insertions(+), 5 deletions(-)

M doc/guix.texi
M gnu/system.scm
M guix/build/profiles.scm
M doc/guix.texi => doc/guix.texi +2 -2
@@ 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


M gnu/system.scm => gnu/system.scm +2 -2
@@ 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

M guix/build/profiles.scm => guix/build/profiles.scm +1 -1
@@ 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