Skip to content

Commit acaa144

Browse files
committed
Adapt sh-to-mod path-like env var parsing for Fish 4.3
Path-like environment variable are now printed by `set -xgL` as: PATH '/usr/bin' '/home/user/.local/bin' instead of: PATH '/usr/bin' '/home/user/.local/bin' Double space changed into a single space separator. Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent 138e1fc commit acaa144

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ Modules 5.7.0 (not yet released)
3434
current Modules version against an installed version of Lmod.
3535
* Update the :subcmd:`sh-to-mod` mechanism to correctly parse shell alias on
3636
Dash shell version 0.5.13.
37+
* Update the :subcmd:`sh-to-mod` mechanism to correctly parse path-like
38+
environment variable on Fish shell version 4.3.
3739

3840

3941
.. _5.6 release notes:

tcl/mfcmd.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,7 @@ proc execShAndGetEnv {elt_ignored_list shell script args} {
14961496
)?([^-]\S+)(.*?)$}
14971497
set comprevar [list match valpart1 name valpart2]
14981498
# translate back fish-specific code
1499-
set varvalmap [list {' '} : {\'} ' {\"} \" \\\\ \\]
1499+
set varvalmap [list {' '} : {' '} : {\'} ' {\"} \" \\\\ \\]
15001500
set alvalmap [list { $argv;} {}]
15011501
15021502
# fish builtins change LS_COLORS variable

0 commit comments

Comments
 (0)