max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-02-16 15:17:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dropEmptyInitThenConcatStringsSep -> concatStringSep: PATH handling

Browse source 
It's still wrong, but one step closer to correct.
Not that anyone should use "" or "." in their PATH, but that is not
for us to intervene.
This commit is contained in:
Robert Hensing 2024-07-13 01:49:34 +02:00
parent 9ca42d5da2
commit 76b2d5ef3d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix/env.cc
View file

@ -3,6 +3,7 @@
#include "command.hh"
#include "run.hh"
#include "strings.hh"
using namespace nix;
@ -92,9 +93,10 @@ struct CmdShell : InstallablesCommand, MixEnvironment
}
}
// TODO: split losslessly; empty means .
auto unixPath = tokenizeString<Strings>(getEnv("PATH").value_or(""), ":");
unixPath.insert(unixPath.begin(), pathAdditions.begin(), pathAdditions.end());
auto unixPathString = dropEmptyInitThenConcatStringsSep(":", unixPath);
auto unixPathString = concatStringsSep(":", unixPath);
setEnv("PATH", unixPathString.c_str());
Strings args;