* Fixed path issues in the installer

 * Fixed shortcuts in the installer
 * Fixed so clients can understand no prefixed arguments ie.
     ... -c nrpe_query -a command=check_ok host=129.168.0.1

Author: mickem

changelog

@@ -4,6 +4,12 @@ TODO:
  * Fix dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
 
+2012-12-18 MickeM
+ * Fixed path issues in the installer
+ * Fixed shortcuts in the installer
+ * Fixed so clients can understand no prefixed arguments ie.
+     ... -c nrpe_query -a command=check_ok host=129.168.0.1
+
 2012-12-02 MickeM
  * Added option to disable new alias check_cpu and only register old ones CheckCPU
    [/settings/default]

helpers/installers/installer/Product.wxs

@@ -51,12 +51,15 @@
 					</Component>
 					<Component Id="Shortcuts" Guid="4BCF8026-B209-4d33-B323-5B2ACC43A258" Win64="$(var.Win64)">
 						<Shortcut Id="StartmenuNSClientTest" Directory="ProgramMenuDir" Name="$(var.App.Title) ($(var.arch), test)" 
+                      Target="[INSTALLLOCATION]nscp.exe"
                         WorkingDirectory="INSTALLDIR" Icon="nscp.exe" IconIndex="0" 
                       Arguments="test" Description="Run $(var.App.Title) in test mode" />
 						<Shortcut Id="StartmenuNSClientStart" Directory="ProgramMenuDir" Name="Start $(var.App.Title) ($(var.arch))"
+                      Target="[INSTALLLOCATION]nscp.exe"
 								  WorkingDirectory='INSTALLDIR' Icon="nscp.exe" IconIndex="0"
 								  Arguments="service --name [SERVICE_NAME] --start" Description="Start the $(var.App.Title) service" />
 						<Shortcut Id="StartmenuNSClientStop" Directory="ProgramMenuDir" Name="Stop $(var.App.Title) ($(var.arch))"
+                      Target="[INSTALLLOCATION]nscp.exe"
 								  WorkingDirectory='INSTALLDIR' Icon="nscp.exe" IconIndex="0"
 								  Arguments="service --name [SERVICE_NAME] --stop" Description="Stop the $(var.App.Title) service" />
 						<Shortcut Id="StarmentNSCHelp" Directory="ProgramMenuDir" Name="Documentation"
@@ -177,8 +180,6 @@
 								<File Id="P_script_003" Name="test_pb.py" DiskId="1" Source="$(var.Source)/scripts/python/test_pb.py" Vital="no" />
 								<File Id="P_script_004" Name="test_sample.py" DiskId="1" Source="$(var.Source)/scripts/python/test_sample.py" Vital="no" />
 							</Component>
-						</Directory>
-
 						<Directory Id="INSTALLLOCATION_SCRIPTS_PYTHON_LIB1" Name="lib">
 							<Component Id="PythonScriptsPBLib1" Guid="7BB3FE48-7E17-4796-9135-76A26DB3B81E" Win64="$(var.Win64)">
 								<File Id="p_script_lib_001" Name="__init__.py" DiskId="1" Source="$(var.Source)/scripts/python/lib/__init__.py" Vital="no" />
@@ -223,6 +224,7 @@
 							</Directory>
 						</Directory>
 					</Directory>
+          </Directory>
 				</Directory>
 			</Directory>
 

include/client/command_line_parser.cpp

@@ -182,6 +182,23 @@ int client::command_manager::exec_simple(configuration &config, const std::wstri
 	// TODO: Add support for target here!
 	return client::command_line_parser::do_execute_command_as_exec(config, ci.command, rendered_arguments, response);
 }
+
+std::vector<boost::program_options::option> option_parser(std::vector<std::string> &args) {
+	std::vector<boost::program_options::option> result;
+	BOOST_FOREACH(const std::string &s, args) {
+		boost::program_options::option opt;
+		std::string::size_type pos = s.find('=');
+		if (pos == std::string::npos) {
+			opt.string_key = s;
+		} else {
+			opt.string_key = s.substr(0, pos);
+			opt.value.push_back(s.substr(pos+1));
+		}
+		result.push_back(opt);
+	}
+	args.clear();
+	return result;
+}
 int client::command_line_parser::do_query(configuration &config, const std::wstring &command, std::list<std::wstring> &arguments, std::string &response) {
 	boost::program_options::variables_map vm;
 	try {
@@ -196,7 +213,17 @@ int client::command_line_parser::do_query(configuration &config, const std::wstr
 		std::vector<std::wstring> vargs(arguments.begin(), arguments.end());
 		po::positional_options_description p;
 		p.add("arguments", -1);
-		po::wparsed_options parsed = po::basic_command_line_parser<wchar_t>(vargs).options(desc).positional(p).run();
+
+		po::basic_command_line_parser<wchar_t> cmd(vargs);
+		cmd.options(desc);
+		cmd.positional(p);
+		if (arguments.size() > 0) {
+			const std::wstring s = arguments.front();
+			if (s.size() > 0 && s[0] != L'-') {
+				cmd.extra_style_parser(option_parser);
+			}
+		}
+		po::wparsed_options parsed = cmd.run();
 		po::store(parsed, vm);
 		po::notify(vm);
 	} catch (const std::exception &e) {

version.txt

@@ -1,3 +1,3 @@
 version=0.4.1
-build=72
-date=2012-12-02
+build=73
+date=2012-12-17