wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

* Help text for all (non-script) programs, so no more:

Browse source 
$ nix-instantiate --help
error: unknown flag `--help`
Try `nix-instantiate --help' for more information.

:-)
This commit is contained in:
Eelco Dolstra 2003-12-01 15:55:05 +00:00
parent 905d5b91fa
commit 078e20885e
14 changed files with 126 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix-store/Makefile.am
View file

@ -6,7 +6,7 @@ nix_store_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil
main.o: help.txt.hh
%.hh: %
%.txt.hh: %.txt
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \

10
src/nix-store/main.cc
View file

@ -12,14 +12,12 @@
typedef void (* Operation) (Strings opFlags, Strings opArgs);
static void printHelp()
void printHelp()
{
cout << string((char *) helpText, sizeof helpText);
exit(0);
}
static Path checkPath(const Path & arg)
{
return arg; /* !!! check that arg is in the store */
@ -276,12 +274,6 @@ void run(Strings args)
op = opInit;
else if (arg == "--verify")
op = opVerify;
else if (arg == "--verbose" || arg == "-v")
verbosity = (Verbosity) ((int) verbosity + 1);
else if (arg == "--keep-failed" || arg == "-K")
keepFailed = true;
else if (arg == "--help")
printHelp();
else if (arg[0] == '-')
opFlags.push_back(arg);
else