bin/calabash-ios-setup.rb in calabash-cucumber-0.9.104 vs bin/calabash-ios-setup.rb in calabash-cucumber-0.9.105

- old
+ new

@@ -22,11 +22,11 @@ end end def calabash_setup(args) puts "Checking if Xcode is running..." - res = `ps x -o pid,command | grep -v grep | grep Xcode.app/Contents/MacOS/Xcode` + res = `ps x -o pid,command | grep -v grep | grep Contents/MacOS/Xcode` if res=="" puts "Xcode not running." project_name, project_path, xpath = find_project_files(args) setup_project(project_name, project_path, xpath) @@ -47,25 +47,11 @@ puts "(if you don't already have a features folder)." end else puts "Xcode is running. We'll be changing the project file so we'd better stop it." - puts "Shall I stop Xcode? Please answer yes (y) or no (n)" - answer = STDIN.gets.chomp - if (answer == 'yes' or answer == 'y') - res.split("\n").each do |line| - pid = line.split(" ")[0] - if system("kill #{pid}") - puts "Stopped XCode. Retrying... " - calabash_setup(args) - else - puts "Killing Xcode seemed to fail :( Aborting..." - end - end - else - puts "Please stop Xcode and try again." - exit(0) - end + puts "Please stop XCode and run setup again" + exit(0) end end def find_project_files(args) dir_to_search, project_files = ensure_correct_path(args) \ No newline at end of file