bin/calabash-ios-setup.rb in calabash-cucumber-0.9.33 vs bin/calabash-ios-setup.rb in calabash-cucumber-0.9.34
- old
+ new
@@ -457,12 +457,12 @@
msg("Error") do
puts msg.join("\n")
end
exit 1
end
- out_debug = `otool #{sim_dirs[0]}/* -o 2> /dev/null | grep CalabashServer`
- out_cal = `otool #{sim_dirs[1]}/* -o 2> /dev/null | grep CalabashServer 2> /dev/null`
+ out_debug = `otool "#{sim_dirs[0]}"/* -o 2> /dev/null | grep CalabashServer`
+ out_cal = `otool "#{sim_dirs[1]}"/* -o 2> /dev/null | grep CalabashServer 2> /dev/null`
ok = (not /CalabashServer/.match(out_debug)) and /CalabashServer/.match(out_cal)
if ok
msg("OK") do
puts "Your configuration seems ok."
puts "app in directory:"
@@ -502,11 +502,11 @@
fail = true
end
app_dir = Dir.foreach("#{dir}/Payload").find {|d| /\.app$/.match(d)}
app = app_dir.split(".")[0]
- res = `otool #{dir}/Payload/#{app_dir}/#{app} -o 2> /dev/null | grep CalabashServer`
+ res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/#{app}" -o 2> /dev/null | grep CalabashServer`
msg("Info") do
if /CalabashServer/.match(res)
puts "Ipa: #{ipa} *contains* calabash.framework"
else
puts "Ipa: #{ipa} *does not contain* calabash.framework"
@@ -525,10 +525,10 @@
msg("Error") do
puts "Path: #{app} is not a directory."
end
exit 1
end
- out = `otool #{app}/* -o 2> /dev/null | grep CalabashServer`
+ out = `otool "#{File.expand_path(app)}"/* -o 2> /dev/null | grep CalabashServer`
msg("Info") do
if /CalabashServer/.match(out)
puts "App: #{app} *contains* calabash.framework"
else
\ No newline at end of file