tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 03:51:53 +02:00
Code Activity

environment: Fix '--emulate-fhs' option overriding $PATH.

Browse Source 
Fixes <https://issues.guix.gnu.org/60566> where even if "--preserve='^PATH$'"
was passed to 'guix shell' it would be replaced by just the FHS directories
when '--emulate-fhs' was also set.

* gnu/scripts/environment.scm (launch-environment): Add the FHS directories to
$PATH rather than overriding $PATH completely.
* tests/guix-environment-container.sh: Test that FHS directories are in $PATH
in the container and that $PATH can be preserved.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
John Kehayias
2023-01-05 16:06:19 -05:00
parent a5b914156e
commit 3bfbfa2946
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/guix-environment-container.sh
+12 -1
View File
@@ -1,6 +1,7 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2015 David Thompson <davet@gnu.org>
# Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
# Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
# Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -242,6 +243,16 @@ guix shell -CF --bootstrap guile-bootstrap glibc \
0
1))'
# Test that $PATH inside the container includes the FHS directories.
guix shell -CF coreutils -- env | grep ^PATH=/bin:/usr/bin:/sbin:/usr/sbin.*
# Make sure '--preserve' is honored for $PATH, which the '--emulate-fhs'
# option modifies. We can't (easily) check the whole $PATH as it will differ
# inside and outside the container, so just check our test $PATH is still
# present. See <https://issues.guix.gnu.org/60566>.
PATH=/foo $(type -P guix) shell -CF -E ^PATH$ coreutils \
-- env | grep ^PATH=.*:/foo
# '--symlink' works.
echo "TESTING SYMLINK IN CONTAINER"
guix shell --bootstrap guile-bootstrap --container \