#5617 Remove plugin args from ArgParser

This commit is contained in:
Andrew Nelless 2016-09-27 12:43:05 +01:00
parent 011da60cca
commit a2ad4cb0dc
1 changed files with 4 additions and 11 deletions

View File

@ -189,18 +189,10 @@ ArgParser::parseToolArgs(ToolArgs& args, int argc, const char* const* argv)
args.m_loginAuthenticate = true; args.m_loginAuthenticate = true;
return true; return true;
} }
else if (isArg(i, argc, argv, NULL, "--get-plugin-list", 0)) {
args.m_getPluginList = true;
return true;
}
else if (isArg(i, argc, argv, NULL, "--get-installed-dir", 0)) { else if (isArg(i, argc, argv, NULL, "--get-installed-dir", 0)) {
args.m_getInstalledDir = true; args.m_getInstalledDir = true;
return true; return true;
} }
else if (isArg(i, argc, argv, NULL, "--get-plugin-dir", 0)) {
args.m_getPluginDir = true;
return true;
}
else if (isArg(i, argc, argv, NULL, "--get-profile-dir", 0)) { else if (isArg(i, argc, argv, NULL, "--get-profile-dir", 0)) {
args.m_getProfileDir = true; args.m_getProfileDir = true;
return true; return true;
@ -330,9 +322,6 @@ ArgParser::parseGenericArgs(int argc, const char* const* argv, int& i)
else if (isArg(i, argc, argv, NULL, "--profile-dir", 1)) { else if (isArg(i, argc, argv, NULL, "--profile-dir", 1)) {
argsBase().m_profileDirectory = argv[++i]; argsBase().m_profileDirectory = argv[++i];
} }
else if (isArg(i, argc, argv, NULL, "--plugin-dir", 1)) {
argsBase().m_pluginDirectory = argv[++i];
}
else { else {
// option not supported here // option not supported here
return false; return false;
@ -348,6 +337,10 @@ ArgParser::parseDeprecatedArgs(int argc, const char* const* argv, int& i)
LOG((CLOG_NOTE "--crypto-pass is deprecated")); LOG((CLOG_NOTE "--crypto-pass is deprecated"));
i++; i++;
return true; return true;
} else if (isArg(i, argc, argv, NULL, "--plugin-dir", 1)) {
LOG((CLOG_NOTE "--plugin-dir is deprecated"));
++i;
return true;
} }
return false; return false;