From a3c4eb096456673b48f4fc35b76097d67e022141 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Oct 2015 16:53:07 +0200 Subject: nix-prefetch-url: $PRINT_PATH -> --print-path --- src/nix-prefetch-url/nix-prefetch-url.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/nix-prefetch-url/nix-prefetch-url.cc') diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc index bd52df1c74a3..cb6078fca1c7 100644 --- a/src/nix-prefetch-url/nix-prefetch-url.cc +++ b/src/nix-prefetch-url/nix-prefetch-url.cc @@ -48,6 +48,7 @@ int main(int argc, char * * argv) HashType ht = htSHA256; std::vector 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; }); } -- cgit 1.4.1