maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-env: Create ~/.nix-profile automatically

Browse source 
(cherry picked from commit 9348f9291e5d9e4ba3c4347ea1b235640f54fd79)
This commit is contained in:
Eelco Dolstra 2019-10-09 19:21:07 +02:00
parent 2070d55b0b
commit f66108f738
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
9 changed files with 31 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libutil/util.cc
View file

@ -475,6 +475,16 @@ Path createTempDir(const Path & tmpRoot, const Path & prefix,
}
std::string getUserName()
{
auto pw = getpwuid(geteuid());
std::string name = pw ? pw->pw_name : getEnv("USER", "");
if (name.empty())
throw Error("cannot figure out user name");
return name;
}
static Lazy<Path> getHome2([]() {
Path homeDir = getEnv("HOME");
if (homeDir.empty()) {

2
src/libutil/util.hh
View file

@ -126,6 +126,8 @@ void deletePath(const Path & path, unsigned long long & bytesFreed);
Path createTempDir(const Path & tmpRoot = "", const Path & prefix = "nix",
bool includePid = true, bool useGlobalCounter = true, mode_t mode = 0755);
std::string getUserName();
/* Return $HOME or the user's home directory from /etc/passwd. */
Path getHome();