X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6d73fe5be080e66a4f6ff2b250ed1957ae7ac063..011188e3920f21e6883c2dab956b3d4fb4e8cbfa:/cmdline/apt.cc

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 07ade6b7c..e32a9f1e3 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -11,39 +11,12 @@
 // Include Files							/*{{{*/
 #include<config.h>
 
-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <iomanip>
-#include <algorithm>
-
-
+#include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheset.h>
 #include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
-#include <apt-pkg/hashes.h>
-
-#include <apti18n.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
 
 #include <apt-private/private-list.h>
 #include <apt-private/private-search.h>
@@ -55,129 +28,84 @@
 #include <apt-private/private-upgrade.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
-#include <apt-private/private-utils.h>
 #include <apt-private/private-sources.h>
-									/*}}}*/
 
+#include <unistd.h>
+#include <iostream>
+#include <vector>
 
+#include <apti18n.h>
+									/*}}}*/
 
-bool ShowHelp(CommandLine &CmdL)
+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
-   c1out << 
+   std::cout <<
     _("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 systems 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;
 }
-
-// figure out what kind of upgrade the user wants
-bool DoAptUpgrade(CommandLine &CmdL)
+									/*}}}*/
+std::vector<CommandLine::DispatchWithHelp> GetCommands()		/*{{{*/
 {
-   if (_config->FindB("Apt::Cmd::Dist-Upgrade"))
-      return DoDistUpgrade(CmdL);
-   else
-      return DoUpgradeWithAllowNewPackages(CmdL);
+   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[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"list",&List},
-                                   {"search", &FullTextSearch},
-                                   {"show", &APT::Cmd::ShowPackage},
-                                   // package stuff
-                                   {"install",&DoInstall},
-                                   {"remove", &DoInstall},
-                                   {"purge", &DoInstall},
-                                   // system wide stuff
-                                   {"update",&DoUpdate},
-                                   {"upgrade",&DoAptUpgrade},
-                                   // misc
-                                   {"edit-sources",&EditSources},
-                                   // helper
-                                   {"moo",&DoMoo},
-                                   {"help",&ShowHelp},
-                                   {0,0}};
-
-   std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
-
-   InitOutput();
+   InitLocale();
 
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
+   CommandLine CmdL;
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT, &_config, &_system, argc, argv);
 
-    if(pkgInitConfig(*_config) == false) 
-    {
-        _error->DumpErrors();
-        return 100;
-    }
-
-   // FIXME: move into a new libprivate/private-install.cc:Install()
-   _config->Set("DPkgPM::Progress", "1");
-   _config->Set("Apt::Color", "1");
-
-   // Parse the command line and initialize the package library
-   CommandLine CmdL(Args.data(), _config);
-   if (CmdL.Parse(argc, argv) == false ||
-       pkgInitSystem(*_config, _system) == false)
-   {
-      _error->DumpErrors();
-      return 100;
-   }
-
-   if(!isatty(STDOUT_FILENO) && 
-      _config->FindB("Apt::Cmd::Disable-Script-Warning", false) == false)
+   int const quiet = _config->FindI("quiet", 0);
+   if (quiet == 2)
    {
-      std::cerr << std::endl
-                << "WARNING: " << argv[0] << " "
-                << "does not have a stable CLI interface yet. "
-                << "Use with caution in scripts."
-                << std::endl
-                << std::endl;
+      _config->CndSet("quiet::NoProgress", true);
+      _config->Set("quiet", 1);
    }
-   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
 
-   // 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);
 }
 									/*}}}*/