D7539.diff
All Users
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7539.diff
View Options

	diff --git a/src/applications/harbormaster/step/RemoteCommandBuildStepImplementation.php b/src/applications/harbormaster/step/RemoteCommandBuildStepImplementation.php
	--- a/src/applications/harbormaster/step/RemoteCommandBuildStepImplementation.php
	+++ b/src/applications/harbormaster/step/RemoteCommandBuildStepImplementation.php
	@@ -26,20 +26,38 @@

	$settings = $this->getSettings();

	+ $parameters = array();
	+ $matches = array();
	+ $variables = $this->retrieveVariablesFromBuild($build);
	+ $command = $settings['command'];
	+ preg_match_all(
	+ "/\\\$\\{(?P<name>[a-z]+)\\}/",
	+ $command,
	+ $matches);
	+ foreach ($matches["name"] as $match) {
	+ $parameters[] = idx($variables, $match, "");
	+ }
	+ $command = str_replace("%", "%%", $command);
	+ $command = preg_replace("/\\\$\\{(?P<name>[a-z]+)\\}/", "%s", $command);
	+
	+ $command = vcsprintf(
	+ $command,
	+ $parameters);
	+
	$future = null;
	if (empty($settings['sshkey'])) {
	$future = new ExecFuture(
	'ssh -o "StrictHostKeyChecking no" -p %s %s %s',
	$settings['sshport'],
	$settings['sshuser'].'@'.$settings['sshhost'],
	- $this->mergeVariables($build, $settings['command']));
	+ $command);
	} else {
	$future = new ExecFuture(
	'ssh -o "StrictHostKeyChecking no" -p %s -i %s %s %s',
	$settings['sshport'],
	$settings['sshkey'],
	$settings['sshuser'].'@'.$settings['sshhost'],
	- $this->mergeVariables($build, $settings['command']));
	+ $command);
	}

	$log_stdout = $build->createLog($build_step, "remote", "stdout");