X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e6645b9fb9ba3a7ff7b6663af3f5e1bcb6f23d78..ece81b7517b1af6f86aff733498f6c11d5aa814f:/cmdline/apt.cc diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 47187fac2..4b266bcbe 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -11,39 +11,12 @@ // Include Files /*{{{*/ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - +#include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include - -#include +#include +#include #include #include @@ -55,149 +28,91 @@ #include #include #include -#include - /*}}}*/ - -// EditSource - EditSourcesList /*{{{*/ -// --------------------------------------------------------------------- -bool EditSources(CommandLine &CmdL) -{ - bool res; - pkgSourceList sl; - std::string outs; - - // FIXME: suport CmdL.FileList to specify sources.list.d files - std::string sourceslist = _config->FindFile("Dir::Etc::sourcelist"); - - HashString before; - before.FromFile(sourceslist); +#include +#include +#include +#include - do { - EditFileInSensibleEditor(sourceslist); - _error->PushToStack(); - res = sl.Read(sourceslist); - if (!res) { - strprintf(outs, _("Failed to parse %s. Edit again? "), - sourceslist.c_str()); - std::cout << outs; - res = !YnPrompt(true); - } - _error->RevertToStack(); - } while (res == false); +#include +#include +#include - if (!before.VerifyFile(sourceslist)) { - strprintf( - outs, _("Your '%s' file changed, please run 'apt-get update'."), - sourceslist.c_str()); - std::cout << outs << std::endl; - } +#include + /*}}}*/ +static bool ShowHelp(CommandLine &) /*{{{*/ +{ + 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; } /*}}}*/ - - -bool ShowHelp(CommandLine &CmdL) +static std::vector GetCommands() /*{{{*/ { - ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, - COMMON_ARCH,__DATE__,__TIME__); - - // FIXME: generate from CommandLine - c1out << - _("Usage: apt [options] command\n" - "\n" - "CLI for apt.\n" - "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" - " install - install packages\n" - " upgrade - upgrade the systems packages\n" - "\n" - " edit-sources - edit the source information file\n" - ); - - return true; + 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")}, + + // 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} + }; } - + /*}}}*/ int main(int argc, const char *argv[]) /*{{{*/ { - CommandLine::Dispatch Cmds[] = {{"list",&List}, - {"search", &FullTextSearch}, - {"show", &APT::Cmd::ShowPackage}, - // needs root - {"install",&DoInstall}, - {"remove", &DoInstall}, - {"update",&DoUpdate}, - {"upgrade",&DoUpgradeWithAllowNewPackages}, - // misc - {"edit-sources",&EditSources}, - // helper - {"moo",&DoMoo}, - {"help",&ShowHelp}, - {0,0}}; + CommandLine CmdL; + auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT, &_config, &_system, argc, argv, &ShowHelp, &GetCommands); - std::vector Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv)); - - if(!isatty(1)) + int const quiet = _config->FindI("quiet", 0); + if (quiet == 2) { - std::cerr << std::endl - << "WARNING WARNING " - << argv[0] - << " is *NOT* intended for scripts " - << "use at your own peril^Wrisk" - << std::endl - << std::endl; + _config->CndSet("quiet::NoProgress", true); + _config->Set("quiet", 1); } + InitSignals(); InitOutput(); - // Set up gettext support - setlocale(LC_ALL,""); - textdomain(PACKAGE); - - 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; - } - - // 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); - - // 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); } /*}}}*/