github-migration/jasmine-headless-webkit
1
0
Fork 0
Code Issues 39 Pull Requests 16 Packages Projects Releases Wiki Activity

what is going on?

Browse Source
This commit is contained in:
John Bintz 2011-09-09 15:45:24 -04:00
parent 64046bc308
commit ade490ba14
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/qt/qmake.rb
View File

@ -80,6 +80,7 @@ module Qt
def best_qmake def best_qmake
if qmake_path = QMAKES.collect do |path| if qmake_path = QMAKES.collect do |path|
$stderr.puts path
result = nil result = nil
if qmake_path = get_exe_path(path) if qmake_path = get_exe_path(path)
if (qt_version = qt_version_of(qmake_path)) >= Gem::Version.create('4.7') if (qt_version = qt_version_of(qmake_path)) >= Gem::Version.create('4.7')
@ -112,8 +113,9 @@ module Qt
end end
def get_exe_path(command) def get_exe_path(command)
system %{bash -c 'which which 2>&1'} $stderr.puts command
system %{bash -c 'which command 2>&1'} $stderr.puts `bash -c 'which which 2>&1'`
$stderr.puts `bash -c 'which #{command} 2>&1'`
path = %x{which #{command}}.strip path = %x{which #{command}}.strip
path = nil if path == '' path = nil if path == ''