aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-11-20 18:41:47 +0100
committerLudovic Courtès <ludo@gnu.org>2017-11-20 18:43:10 +0100
commitbd7e136d295f0d6c1aa5d107356e28c259a54cb9 (patch)
tree38aeb48fb5991c2e90f9d7c35fa835acd527c5d2
parent4b1ba80cef69b951a72e1dfd04bb3ddc5f4e571c (diff)
downloadguix-bd7e136d295f0d6c1aa5d107356e28c259a54cb9.tar
guix-bd7e136d295f0d6c1aa5d107356e28c259a54cb9.tar.gz
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.
-rw-r--r--doc/guix.texi4
-rw-r--r--gnu/system.scm4
-rw-r--r--guix/build/profiles.scm2
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index d4a2a696a4..4f8453ebf0 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 9e05c4b213..7466ed780d 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 5c96fe9067..b4160fba1b 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