Commit 70c1856c authored by James Robinson's avatar James Robinson

Merge pull request #45 from jamesr/run_mojo_args

Forward additional arguments to runner in run_mojo command
parents f554ba41 be4a9d94
...@@ -55,17 +55,19 @@ class RunMojoCommandHandler extends CommandHandler { ...@@ -55,17 +55,19 @@ class RunMojoCommandHandler extends CommandHandler {
args.add('--verbose'); args.add('--verbose');
} }
} }
args.addAll(results.rest);
return runCommandAndStreamOutput(command, args); return runCommandAndStreamOutput(command, args);
} }
Future<int> _runLinux(ArgResults results, String appPath, ArtifactStore artifacts) async { Future<int> _runLinux(ArgResults results, String appPath, ArtifactStore artifacts) async {
String viewerPath = await _makePathAbsolute(await artifacts.getPath(Artifact.SkyViewerMojo)); String viewerPath = await _makePathAbsolute(await artifacts.getPath(Artifact.SkyViewerMojo));
String mojoShellPath = await _makePathAbsolute(path.join(results['mojo-path'], 'out', 'Release', 'mojo_shell')); String mojoShellPath = await _makePathAbsolute(path.join(results['mojo-path'], 'out', 'Release', 'mojo_shell'));
List<String> mojoRunArgs = [ List<String> args = [
'mojo:window_manager file://${appPath}', 'mojo:window_manager file://${appPath}',
'--url-mappings=mojo:window_manager=mojo:kiosk_wm,mojo:sky_viewer=file://${viewerPath}' '--url-mappings=mojo:window_manager=mojo:kiosk_wm,mojo:sky_viewer=file://${viewerPath}'
]; ];
return runCommandAndStreamOutput(mojoShellPath, mojoRunArgs); args.addAll(results.rest);
return runCommandAndStreamOutput(mojoShellPath, args);
} }
@override @override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment