[selenium] r10616 committed - JariBakken: More Cygwin fixes.

[codesite...@google.com]

Revision: 10616
Author: jari.bakken
Date: Fri Dec 10 10:29:16 2010
Log: JariBakken: More Cygwin fixes.
http://code.google.com/p/selenium/source/detail?r=10616

Modified:
/trunk/rb/lib/selenium/webdriver/chrome/launcher.rb
/trunk/rb/lib/selenium/webdriver/common/platform.rb

=======================================
--- /trunk/rb/lib/selenium/webdriver/chrome/launcher.rb Fri Dec 10 10:03:19
2010
+++ /trunk/rb/lib/selenium/webdriver/chrome/launcher.rb Fri Dec 10 10:29:16
2010
@@ -59,7 +59,6 @@

def launch_chrome(server_url)
path = self.class.binary_path
- path = Platform.cygwin_path(path) if Platform.cygwin?

args = [
Platform.wrap_in_quotes_if_necessary(path),
@@ -141,13 +140,17 @@
end

def windows_paths
- [
+ paths = [
windows_registry_path,
"#{ENV['USERPROFILE']}\\Local Settings\\Application
Data\\Google\\Chrome\\Application\\chrome.exe",
"#{ENV['USERPROFILE']}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
"#{Platform.home}\\Local Settings\\Application
Data\\Google\\Chrome\\Application\\chrome.exe",
"#{Platform.home}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
].compact
+
+ paths.map! { |path| Platform.cygwin_path(path) } if
Platform.cygwin?
+
+ paths
end

def windows_registry_path
=======================================
--- /trunk/rb/lib/selenium/webdriver/common/platform.rb Fri Dec 10 10:03:19
2010
+++ /trunk/rb/lib/selenium/webdriver/common/platform.rb Fri Dec 10 10:29:16
2010
@@ -88,7 +88,7 @@
end

def wrap_in_quotes_if_necessary(str)
- win? ? %{"#{str}"} : str
+ win? && !cygwin? ? %{"#{str}"} : str
end

def cygwin_path(path)