From e418976107ed1581c108c82cd5b3b06c2f4ba9db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 14 Jan 2007 12:32:44 +0000 Subject: * Option --argstr for passing string arguments easily. (NIX-75) --- src/nix-instantiate/nix-instantiate.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/nix-instantiate') diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index b49b84e36a..3822de5c62 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -10,6 +10,7 @@ #include "expr-to-xml.hh" #include "util.hh" #include "store-api.hh" +#include "common-opts.hh" #include "help.txt.hh" @@ -112,15 +113,8 @@ void run(Strings args) throw UsageError("`--attr' requires an argument"); attrPaths.push_back(*i++); } - else if (arg == "--arg") { - if (i == args.end()) - throw UsageError("`--arg' requires two arguments"); - string name = *i++; - if (i == args.end()) - throw UsageError("`--arg' requires two arguments"); - Expr value = parseExprFromString(state, *i++, absPath(".")); - autoArgs.set(toATerm(name), value); - } + else if (parseOptionArg(arg, i, args.end(), state, autoArgs)) + ; else if (arg == "--add-root") { if (i == args.end()) throw UsageError("`--add-root' requires an argument"); -- cgit 1.4.1