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

Merge pull request #7518 from fricklerhandwerk/doc-commands

Browse source 
separate man pages for `nix-store` and `nix-env` subcommands
This commit is contained in:
Valentin Gagarin 2023-03-30 15:33:08 +02:00 • committed by GitHub
commit 368c5b8b9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 2178 additions and 1718 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/nix-env/nix-env.cc
View file

@ -1387,6 +1387,8 @@ static int main_nix_env(int argc, char * * argv)
{
Strings opFlags, opArgs;
Operation op = 0;
std::string opName;
bool showHelp = false;
RepairFlag repair = NoRepair;
std::string file;
@ -1426,37 +1428,59 @@ static int main_nix_env(int argc, char * * argv)
Operation oldOp = op;
if (*arg == "--help")
showManPage("nix-env");
showHelp = true;
else if (*arg == "--version")
op = opVersion;
else if (*arg == "--install" || *arg == "-i")
else if (*arg == "--install" || *arg == "-i") {
op = opInstall;
opName = "-install";
}
else if (*arg == "--force-name") // undocumented flag for nix-install-package
globals.forceName = getArg(*arg, arg, end);
else if (*arg == "--uninstall" || *arg == "-e")
else if (*arg == "--uninstall" || *arg == "-e") {
op = opUninstall;
else if (*arg == "--upgrade" || *arg == "-u")
opName = "-uninstall";
}
else if (*arg == "--upgrade" || *arg == "-u") {
op = opUpgrade;
else if (*arg == "--set-flag")
opName = "-upgrade";
}
else if (*arg == "--set-flag") {
op = opSetFlag;
else if (*arg == "--set")
opName = arg->substr(1);
}
else if (*arg == "--set") {
op = opSet;
else if (*arg == "--query" || *arg == "-q")
opName = arg->substr(1);
}
else if (*arg == "--query" || *arg == "-q") {
op = opQuery;
opName = "-query";
}
else if (*arg == "--profile" || *arg == "-p")
globals.profile = absPath(getArg(*arg, arg, end));
else if (*arg == "--file" || *arg == "-f")
file = getArg(*arg, arg, end);
else if (*arg == "--switch-profile" || *arg == "-S")
else if (*arg == "--switch-profile" || *arg == "-S") {
op = opSwitchProfile;
else if (*arg == "--switch-generation" || *arg == "-G")
opName = "-switch-profile";
}
else if (*arg == "--switch-generation" || *arg == "-G") {
op = opSwitchGeneration;
else if (*arg == "--rollback")
opName = "-switch-generation";
}
else if (*arg == "--rollback") {
op = opRollback;
else if (*arg == "--list-generations")
opName = arg->substr(1);
}
else if (*arg == "--list-generations") {
op = opListGenerations;
else if (*arg == "--delete-generations")
opName = arg->substr(1);
}
else if (*arg == "--delete-generations") {
op = opDeleteGenerations;
opName = arg->substr(1);
}
else if (*arg == "--dry-run") {
printInfo("(dry run; not doing anything)");
globals.dryRun = true;
@ -1485,6 +1509,7 @@ static int main_nix_env(int argc, char * * argv)
myArgs.parseCmdline(argvToStrings(argc, argv));
if (showHelp) showManPage("nix-env" + opName);
if (!op) throw UsageError("no operation specified");
auto store = openStore();

85
src/nix-store/nix-store.cc
View file

@ -1024,62 +1024,104 @@ static int main_nix_store(int argc, char * * argv)
Strings opFlags, opArgs;
Operation op = 0;
bool readFromStdIn = false;
std::string opName;
bool showHelp = false;
parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
Operation oldOp = op;
if (*arg == "--help")
showManPage("nix-store");
showHelp = true;
else if (*arg == "--version")
op = opVersion;
else if (*arg == "--realise" || *arg == "--realize" || *arg == "-r")
else if (*arg == "--realise" || *arg == "--realize" || *arg == "-r") {
op = opRealise;
else if (*arg == "--add" || *arg == "-A")
opName = "-realise";
}
else if (*arg == "--add" || *arg == "-A"){
op = opAdd;
else if (*arg == "--add-fixed")
opName = "-add";
}
else if (*arg == "--add-fixed") {
op = opAddFixed;
opName = arg->substr(1);
}
else if (*arg == "--print-fixed-path")
op = opPrintFixedPath;
else if (*arg == "--delete")
else if (*arg == "--delete") {
op = opDelete;
else if (*arg == "--query" || *arg == "-q")
opName = arg->substr(1);
}
else if (*arg == "--query" || *arg == "-q") {
op = opQuery;
else if (*arg == "--print-env")
opName = "-query";
}
else if (*arg == "--print-env") {
op = opPrintEnv;
else if (*arg == "--read-log" || *arg == "-l")
opName = arg->substr(1);
}
else if (*arg == "--read-log" || *arg == "-l") {
op = opReadLog;
else if (*arg == "--dump-db")
opName = "-read-log";
}
else if (*arg == "--dump-db") {
op = opDumpDB;
else if (*arg == "--load-db")
opName = arg->substr(1);
}
else if (*arg == "--load-db") {
op = opLoadDB;
opName = arg->substr(1);
}
else if (*arg == "--register-validity")
op = opRegisterValidity;
else if (*arg == "--check-validity")
op = opCheckValidity;
else if (*arg == "--gc")
else if (*arg == "--gc") {
op = opGC;
else if (*arg == "--dump")
opName = arg->substr(1);
}
else if (*arg == "--dump") {
op = opDump;
else if (*arg == "--restore")
opName = arg->substr(1);
}
else if (*arg == "--restore") {
op = opRestore;
else if (*arg == "--export")
opName = arg->substr(1);
}
else if (*arg == "--export") {
op = opExport;
else if (*arg == "--import")
opName = arg->substr(1);
}
else if (*arg == "--import") {
op = opImport;
opName = arg->substr(1);
}
else if (*arg == "--init")
op = opInit;
else if (*arg == "--verify")
else if (*arg == "--verify") {
op = opVerify;
else if (*arg == "--verify-path")
opName = arg->substr(1);
}
else if (*arg == "--verify-path") {
op = opVerifyPath;
else if (*arg == "--repair-path")
opName = arg->substr(1);
}
else if (*arg == "--repair-path") {
op = opRepairPath;
else if (*arg == "--optimise" || *arg == "--optimize")
opName = arg->substr(1);
}
else if (*arg == "--optimise" || *arg == "--optimize") {
op = opOptimise;
else if (*arg == "--serve")
opName = "-optimise";
}
else if (*arg == "--serve") {
op = opServe;
else if (*arg == "--generate-binary-cache-key")
opName = arg->substr(1);
}
else if (*arg == "--generate-binary-cache-key") {
op = opGenerateBinaryCacheKey;
opName = arg->substr(1);
}
else if (*arg == "--add-root")
gcRoot = absPath(getArg(*arg, arg, end));
else if (*arg == "--stdin" && !isatty(STDIN_FILENO))
@ -1109,6 +1151,7 @@ static int main_nix_store(int argc, char * * argv)
return true;
});
if (showHelp) showManPage("nix-store" + opName);
if (!op) throw UsageError("no operation specified");
if (op != opDump && op != opRestore) /* !!! hack */