From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Mon, 15 Jan 2018 12:59:14 +0000 (+0100)
Subject: Add quit, exit and help
X-Git-Tag: v2.9.0~184^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f6dc1289b596f4e9331bdd4bdc3f4ffe87321f0;p=icinga2

Add quit, exit and help
---

diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
index 9225fd6d2..735be4b67 100644
--- a/lib/cli/consolecommand.cpp
+++ b/lib/cli/consolecommand.cpp
@@ -132,7 +132,8 @@ void ConsoleCommand::BreakpointHandler(ScriptFrame& frame, ScriptError *ex, cons
 		ShowCodeLocation(std::cout, di);
 
 	std::cout << "You can inspect expressions (such as variables) by entering them at the prompt.\n"
-			<< "To leave the debugger and continue the program use \"$continue\".\n";
+		<< "To leave the debugger and continue the program use \"$continue\".\n"
+		<< "For further commands see \"$help\".\n";
 
 #ifdef HAVE_EDITLINE
 	rl_completion_entry_function = ConsoleCommand::ConsoleCompleteHelper;
@@ -237,7 +238,9 @@ int ConsoleCommand::Run(const po::variables_map& vm, const std::vector<std::stri
 	scriptFrame.Self = scriptFrame.Locals;
 
 	if (!vm.count("eval") && !vm.count("file"))
-		std::cout << "Icinga 2 (version: " << Application::GetAppVersion() << ")\n";
+		std::cout << "Icinga 2 (version: " << Application::GetAppVersion() << ")\n"
+			<< "Type $help to view available commands.\n";
+
 
 	const char *addrEnv = getenv("ICINGA2_API_URL");
 	if (addrEnv)
@@ -382,10 +385,17 @@ incomplete:
 			line = commandOnce;
 
 		if (!line.empty() && line[0] == '$') {
-			if (line == "$continue")
+			if (line == "$continue" || line == "$quit" || line == "$exit")
 				break;
+			else if (line == "$help")
+				std::cout << "Welcome to the Icinga 2 console/script debugger.\n"
+					"Usable commands:\n"
+					"  $continue, $quit, $exit   Quit the console\n"
+					"  $help                     Print this help\n\n"
+					"For more information on how to use this console, please consult the documentation at https://icinga.com/docs\n";
+			else
+				std::cout << "Unknown debugger command: " << line << "\n";
 
-			std::cout << "Unknown debugger command: " << line << "\n";
 			continue;
 		}