wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

nix-prefetch-url: $PRINT_PATH -> --print-path

Browse source
This commit is contained in:
Eelco Dolstra 2015-10-01 16:53:07 +02:00
parent bec3c31608
commit a3c4eb0964
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/nix-prefetch-url/nix-prefetch-url.cc
View file

@ -48,6 +48,7 @@ int main(int argc, char * * argv)
HashType ht = htSHA256;
std::vector<string> args;
Strings searchPath;
bool printPath = getEnv("PRINT_PATH") != "";
parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
if (*arg == "--help")
@ -60,6 +61,8 @@ int main(int argc, char * * argv)
if (ht == htUnknown)
throw UsageError(format("unknown hash type ‘%1%’") % s);
}
else if (*arg == "--print-path")
printPath = true;
else if (parseSearchPathArg(arg, end, searchPath))
;
else if (*arg != "" && arg->at(0) == '-')
@ -123,10 +126,11 @@ int main(int argc, char * * argv)
storePath = store->addToStore(name, tmpFile, false, ht);
}
printMsg(lvlInfo, format("path is ‘%1%’") % storePath);
if (!printPath)
printMsg(lvlInfo, format("path is ‘%1%’") % storePath);
std::cout << printHash16or32(hash) << std::endl;
if (getEnv("PRINT_PATH") != "")
if (printPath)
std::cout << storePath << std::endl;
});
}