centralize unlink checks in acquire-item

[apt.git] / cmdline / apt.cc

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 98e715625f00eaddcd260cc547389c7792d096fc..761ad60db5ccc6386ea3e606205e3a3ebf76d81f 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -29,6 +29,9 @@
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
 #include <apt-private/private-sources.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
 #include <apt-private/private-sources.h>

+#include <apt-private/private-source.h>
+#include <apt-private/private-depends.h>
+#include <apt-private/private-download.h>

 
 #include <unistd.h>
 #include <iostream>
 
 #include <unistd.h>
 #include <iostream>


@@ -37,32 +40,22 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

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

 {
 {

-   ioprintf(c1out, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
-   // FIXME: generate from CommandLine
-   c1out <<
-    _("Usage: apt [options] command\n"
-      "\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;
-   }
-
+   std::cout <<
+      _("Usage: apt [options] command\n"
+           "\n"
+           "apt is a commandline package manager and provides commands for\n"
+           "searching and managing as well as querying information about packages.\n"
+           "It provides the same functionality as the specialized APT tools,\n"
+           "like apt-get and apt-cache, but enables options more suitable for\n"
+           "interactive use by default.\n");

    return true;
 }
    return true;
 }

-
-int main(int argc, const char *argv[])                                 /*{{{*/
+                                                                       /*}}}*/
+std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/

 {
 {

-   InitLocale();
-
-   CommandLine::DispatchWithHelp Cmds[] = {
+   return {

       // query
       {"list", &DoList, _("list packages based on package names")},
       {"search", &DoSearch, _("search in package descriptions")},
       // query
       {"list", &DoList, _("list packages based on package names")},
       {"search", &DoSearch, _("search in package descriptions")},


@@ -79,21 +72,46 @@ int main(int argc, const char *argv[])                                      /*{{{*/
       {"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")},
       {"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},
 
       // misc
       {"edit-sources", &EditSources, _("edit the source information file")},
       {"moo", &DoMoo, nullptr},

+
+      // for compat with muscle memory
+      {"dist-upgrade", &DoDistUpgrade, nullptr},
+      {"showsrc",&ShowSrcPackage, nullptr},
+      {"depends",&Depends, nullptr},
+      {"rdepends",&RDepends, nullptr},
+      {"policy",&Policy, nullptr},
+      {"build-dep", &DoBuildDep,nullptr},
+      {"clean", &DoClean, nullptr},
+      {"autoclean", &DoAutoClean, nullptr},
+      {"auto-clean", &DoAutoClean, nullptr},
+      {"source", &DoSource, nullptr},
+      {"download", &DoDownload, nullptr},
+      {"changelog", &DoChangelog, nullptr},
+

       {nullptr, nullptr, nullptr}
    };
       {nullptr, nullptr, nullptr}
    };

+}
+                                                                       /*}}}*/
+int main(int argc, const char *argv[])                                 /*{{{*/
+{
+   InitLocale();
+
+   CommandLine CmdL;
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT, &_config, &_system, argc, argv);
+
+   int const quiet = _config->FindI("quiet", 0);
+   if (quiet == 2)
+   {
+      _config->CndSet("quiet::NoProgress", true);
+      _config->Set("quiet", 1);
+   }

 
 

-   // FIXME: Those ignore commandline configuration like -q

    InitSignals();
    InitOutput();
 
    InitSignals();
    InitOutput();
 

-   CommandLine CmdL;
-   ParseCommandLine(CmdL, Cmds, "apt", &_config, &_system, argc, argv, ShowHelp);
-

    CheckIfCalledByScript(argc, argv);
    CheckIfSimulateMode(CmdL);
 
    CheckIfCalledByScript(argc, argv);
    CheckIfSimulateMode(CmdL);