generate commands array after config is loaded

[apt.git] / cmdline / apt.cc

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 72086af14a97779c1fc3cded2036248e0f56519d..e32a9f1e3b98a5b3b629979cc4d2f912d328b581 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -37,127 +37,75 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-static bool ShowHelp(CommandLine &)
+bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)/*{{{*/

 {
 {

-   ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
    // FIXME: generate from CommandLine
 
    // FIXME: generate from CommandLine

-   c1out << 
+   std::cout <<

     _("Usage: apt [options] command\n"
       "\n"
     _("Usage: apt [options] command\n"
       "\n"

-      "CLI for apt.\n"
-      "Basic commands: \n"
-      " list - list packages based on package names\n"
-      " search - search in package descriptions\n"
-      " show - show package details\n"
-      "\n"
-      " update - update list of available packages\n"
-      "\n"
-      " install - install packages\n"
-      " remove  - remove packages\n"
-      "\n"
-      " upgrade - upgrade the system by installing/upgrading packages\n"
-      " full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
-      "\n"
-      " edit-sources - edit the source information file\n"
-       );
-   
+      "CLI for apt.\n")
+    << std::endl
+    << _("Commands:") << std::endl;
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+        continue;
+      std::cout << "  " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+

    return true;
 }
    return true;
 }

-
+                                                                       /*}}}*/
+std::vector<CommandLine::DispatchWithHelp> GetCommands()               /*{{{*/
+{
+   return {
+      // query
+      {"list", &DoList, _("list packages based on package names")},
+      {"search", &DoSearch, _("search in package descriptions")},
+      {"show", &ShowPackage, _("show package details")},
+
+      // package stuff
+      {"install", &DoInstall, _("install packages")},
+      {"remove", &DoInstall, _("remove packages")},
+      {"autoremove", &DoInstall, _("Remove automatically all unused packages")},
+      {"auto-remove", &DoInstall, nullptr},
+      {"purge", &DoInstall, nullptr},
+
+      // system wide stuff
+      {"update", &DoUpdate, _("update list of available packages")},
+      {"upgrade", &DoUpgrade, _("upgrade the system by installing/upgrading packages")},
+      {"full-upgrade", &DoDistUpgrade, _("upgrade the system by removing/installing/upgrading packages")},
+      {"dist-upgrade", &DoDistUpgrade, nullptr}, // for compat with muscle memory
+
+      // misc
+      {"edit-sources", &EditSources, _("edit the source information file")},
+      {"moo", &DoMoo, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
+}
+                                                                       /*}}}*/

 int main(int argc, const char *argv[])                                 /*{{{*/
 {
 int main(int argc, const char *argv[])                                 /*{{{*/
 {

-   CommandLine::Dispatch Cmds[] = {
-                                   // query
-                                   {"list",&DoList},
-                                   {"search", &FullTextSearch},
-                                   {"show", &APT::Cmd::ShowPackage},
-
-                                   // package stuff
-                                   {"install",&DoInstall},
-                                   {"remove", &DoInstall},
-                                   {"purge", &DoInstall},
-
-                                   // system wide stuff
-                                   {"update",&DoUpdate},
-                                   {"upgrade",&DoUpgrade},
-                                   {"full-upgrade",&DoDistUpgrade},
-                                   // for compat with muscle memory
-                                   {"dist-upgrade",&DoDistUpgrade},
-
-                                   // misc
-                                   {"edit-sources",&EditSources},
+   InitLocale();

 
 

-                                   // helper
-                                   {"moo",&DoMoo},
-                                   {"help",&ShowHelp},
-                                   {0,0}};
+   CommandLine CmdL;
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT, &_config, &_system, argc, argv);

 
 

-   std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
-
-   // Init the signals
-   InitSignals();
-
-   // Init the output
-   InitOutput();
-
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
-
-    if(pkgInitConfig(*_config) == false) 
-    {
-        _error->DumpErrors();
-        return 100;
-    }
-
-    // some different defaults
-   _config->CndSet("DPkg::Progress-Fancy", "1");
-   _config->CndSet("Apt::Color", "1");
-   _config->CndSet("APT::Get::Upgrade-Allow-New", true);
-
-   // Parse the command line and initialize the package library
-   CommandLine CmdL(Args.data(), _config);
-   if (CmdL.Parse(argc, argv) == false ||
-       pkgInitSystem(*_config, _system) == false)
+   int const quiet = _config->FindI("quiet", 0);
+   if (quiet == 2)

    {
    {

-      _error->DumpErrors();
-      return 100;
+      _config->CndSet("quiet::NoProgress", true);
+      _config->Set("quiet", 1);

    }
 
    }
 

-   if(!isatty(STDOUT_FILENO) && 
-      _config->FindB("Apt::Cmd::Disable-Script-Warning", false) == false)
-   {
-      std::cerr << std::endl
-                << "WARNING: " << argv[0] << " "
-                << "does not have a stable CLI interface yet. "
-                << "Use with caution in scripts."
-                << std::endl
-                << std::endl;
-   }
-
-   // See if the help should be shown
-   if (_config->FindB("help") == true ||
-       _config->FindB("version") == true ||
-       CmdL.FileSize() == 0)
-   {
-      ShowHelp(CmdL);
-      return 0;
-   }
-
-   // see if we are in simulate mode
-   CheckSimulateMode(CmdL);
+   InitSignals();
+   InitOutput();

 
 

-   // parse args
-   CmdL.DispatchArg(Cmds);
+   CheckIfCalledByScript(argc, argv);
+   CheckIfSimulateMode(CmdL);

 
 

-   // Print any errors or warnings found during parsing
-   bool const Errors = _error->PendingError();
-   if (_config->FindI("quiet",0) > 0)
-      _error->DumpErrors();
-   else
-      _error->DumpErrors(GlobalError::DEBUG);
-   return Errors == true ? 100 : 0;
+   return DispatchCommandLine(CmdL, Cmds);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/