From a6f41c35e337db192e612ee6e1545fcae4c69ac7 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Thu, 29 Jun 2017 22:11:09 +0200 Subject: lvc: grab updates from tails (01371c19bd..6ae59c49e5) Signed-off-by: Holger Levsen --- cucumber/features/scripts/vm-execute | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cucumber/features/scripts/vm-execute') diff --git a/cucumber/features/scripts/vm-execute b/cucumber/features/scripts/vm-execute index 79b6942b..f3d20f9f 100755 --- a/cucumber/features/scripts/vm-execute +++ b/cucumber/features/scripts/vm-execute @@ -2,7 +2,9 @@ require 'optparse' begin - require "#{`git rev-parse --show-toplevel`.chomp}/cucumber/features/support/helpers/exec_helper.rb" + require "#{`git rev-parse --show-toplevel`.chomp}/cucumber/features/support/helpers/remote_shell.rb" + require "#{`git rev-parse --show-toplevel`.chomp}/cucumber/features/support/helpers/misc_helpers.rb" + rescue LoadError => e raise "This script must be run from within Tails' Git directory." end @@ -46,7 +48,7 @@ opt_parser = OptionParser.new do |opts| end opt_parser.parse!(ARGV) cmd = ARGV.join(" ") -c = VMCommand.new(FakeVM.new, cmd, cmd_opts) +c = RemoteShell::ShellCommand.new(FakeVM.new, cmd, cmd_opts) puts "Return status: #{c.returncode}" puts "STDOUT:\n#{c.stdout}" puts "STDERR:\n#{c.stderr}" -- cgit v1.2.3-70-g09d2