X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e7e10e47476606e3b2274cf66b1e8ea74b236757..2853201580944cb4e5a2a8a810e800e89e9a0475:/cmdline/apt-extracttemplates.cc?ds=sidebyside

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index e28b42870..8f77425e4 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -215,27 +215,14 @@ bool DebFile::ParseInfo()
 	return true;
 }
 									/*}}}*/
-// ShowHelp - show a short help text					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *)
+static bool ShowHelp(CommandLine &)					/*{{{*/
 {
-	ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
-	if (_config->FindB("version") == true)
-		return true;
-
 	cout <<
 		_("Usage: apt-extracttemplates file1 [file2 ...]\n"
 		"\n"
-		"apt-extracttemplates is a tool to extract config and template info\n"
-		"from debian packages\n"
-		"\n"
-		"Options:\n"
-	        "  -h   This help text\n"
-		"  -t   Set the temp dir\n"
-		"  -c=? Read this configuration file\n"
-		"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
+		"apt-extracttemplates is used to extract config and template files\n"
+		"from debian packages. It is used mainly by debconf(1) to prompt for\n"
+		"configuration questions before installation of packages.\n");
 	return true;
 }
 									/*}}}*/
@@ -343,17 +330,22 @@ static bool Go(CommandLine &CmdL)
 	return !_error->PendingError();
 }
 									/*}}}*/
+static std::vector<aptDispatchWithHelp> GetCommands()			/*{{{*/
+{
+   return {
+	{nullptr, nullptr, nullptr}
+   };
+}
+									/*}}}*/
 int main(int argc, const char **argv)					/*{{{*/
 {
 	InitLocale();
 
-	// Parse the command line and initialize the package library
-	CommandLine::DispatchWithHelp Cmds[] = {{nullptr, nullptr, nullptr}};
 	CommandLine CmdL;
-	ParseCommandLine(CmdL, Cmds, "apt-extracttemplates", &_config, &_system, argc, argv, ShowHelp);
+	auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_EXTRACTTEMPLATES, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
 	Go(CmdL);
 
-	return DispatchCommandLine(CmdL, nullptr);
+	return DispatchCommandLine(CmdL, {});
 }
 									/*}}}*/