From 577fe6d72b304a3f7148c5b9c1b4d156e100d139 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 5 Jul 2012 15:42:28 -0500 Subject: [PATCH] Fix 'or' precedence errors Signed-off-by: Jack Nagel --- Library/Homebrew/macos.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb index c0d31e6fed..328b904199 100644 --- a/Library/Homebrew/macos.rb +++ b/Library/Homebrew/macos.rb @@ -193,7 +193,7 @@ module MacOS extend self # Ask Spotlight where Xcode is. If the user didn't install the # helper tools and installed Xcode in a non-conventional place, this # is our only option. See: http://superuser.com/questions/390757 - path = app_with_bundle_id(XCODE_4_BUNDLE_ID) or app_with_bundle_id(XCODE_3_BUNDLE_ID) + path = app_with_bundle_id(XCODE_4_BUNDLE_ID) || app_with_bundle_id(XCODE_3_BUNDLE_ID) unless path.nil? path += "Contents/Developer" @@ -319,7 +319,7 @@ module MacOS extend self # This returns the version number of XQuartz, not of the upstream X.org # (which is why it is not called x11_version). Note that the X11.app # distributed by Apple is also XQuartz, and therefore covered by this method. - path = app_with_bundle_id(XQUARTZ_BUNDLE_ID) or app_with_bundle_id(APPLE_X11_BUNDLE_ID) + path = app_with_bundle_id(XQUARTZ_BUNDLE_ID) || app_with_bundle_id(APPLE_X11_BUNDLE_ID) version = if not path.nil? and path.exist? `mdls -raw -name kMDItemVersion #{path}`.strip end