Skip to content

Fixes browser version detection exe-path issues #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions webdriver_manager/core/os_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,22 @@ def get_browser_version_from_os(self, browser_type=None):
),
OSType.MAC: r"/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --version",
OSType.WIN: windows_browser_apps_to_cmd(
r'(Get-Item -Path "$env:PROGRAMFILES\Google\Chrome\Application\chrome.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Google\Chrome\Application\chrome.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:LOCALAPPDATA\Google\Chrome\Application\chrome.exe").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Google\Chrome\BLBeacon").version',
r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Google Chrome").version',
r'(Get-Item -Path \"$env:PROGRAMFILES\Google\Chrome\Application\chrome.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES (x86)\Google\Chrome\Application\chrome.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:LOCALAPPDATA\Google\Chrome\Application\chrome.exe\").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::\"HKCU\SOFTWARE\Google\Chrome\BLBeacon\").version',
r'(Get-ItemProperty -Path Registry::\"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Google Chrome\").version',
),
},
ChromeType.CHROMIUM: {
OSType.LINUX: linux_browser_apps_to_cmd("chromium", "chromium-browser"),
OSType.MAC: r"/Applications/Chromium.app/Contents/MacOS/Chromium --version",
OSType.WIN: windows_browser_apps_to_cmd(
r'(Get-Item -Path "$env:PROGRAMFILES\Chromium\Application\chrome.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Chromium\Application\chrome.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:LOCALAPPDATA\Chromium\Application\chrome.exe").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Chromium\BLBeacon").version',
r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Chromium").version',
r'(Get-Item -Path \"$env:PROGRAMFILES\Chromium\Application\chrome.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES (x86)\Chromium\Application\chrome.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:LOCALAPPDATA\Chromium\Application\chrome.exe\").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::\"HKCU\SOFTWARE\Chromium\BLBeacon\").version',
r'(Get-ItemProperty -Path Registry::\"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Chromium\").version',
),
},
ChromeType.BRAVE: {
Expand All @@ -100,11 +100,11 @@ def get_browser_version_from_os(self, browser_type=None):
),
OSType.MAC: r"/Applications/Brave\ Browser.app/Contents/MacOS/Brave\ Browser --version",
OSType.WIN: windows_browser_apps_to_cmd(
r'(Get-Item -Path "$env:PROGRAMFILES\BraveSoftware\Brave-Browser\Application\brave.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES (x86)\BraveSoftware\Brave-Browser\Application\brave.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:LOCALAPPDATA\BraveSoftware\Brave-Browser\Application\brave.exe").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\BraveSoftware\Brave-Browser\BLBeacon").version',
r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\BraveSoftware Brave-Browser").version',
r'(Get-Item -Path \"$env:PROGRAMFILES\BraveSoftware\Brave-Browser\Application\brave.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES (x86)\BraveSoftware\Brave-Browser\Application\brave.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:LOCALAPPDATA\BraveSoftware\Brave-Browser\Application\brave.exe\").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::\"HKCU\SOFTWARE\BraveSoftware\Brave-Browser\BLBeacon\").version',
r'(Get-ItemProperty -Path Registry::\"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\BraveSoftware Brave-Browser\").version',
),
},
ChromeType.MSEDGE: {
Expand All @@ -117,38 +117,38 @@ def get_browser_version_from_os(self, browser_type=None):
OSType.MAC: r"/Applications/Microsoft\ Edge.app/Contents/MacOS/Microsoft\ Edge --version",
OSType.WIN: windows_browser_apps_to_cmd(
# stable edge
r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft\Edge\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Microsoft\Edge\BLBeacon").version',
r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE\Microsoft\EdgeUpdate\Clients\{56EB18F8-8008-4CBD-B6D2-8C97FE7E9062}").pv',
r'(Get-Item -Path \"$env:PROGRAMFILES\Microsoft\Edge\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES (x86)\Microsoft\Edge\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::\"HKCU\SOFTWARE\Microsoft\Edge\BLBeacon\").version',
r'(Get-ItemProperty -Path Registry::\"HKLM\SOFTWARE\Microsoft\EdgeUpdate\Clients\{56EB18F8-8008-4CBD-B6D2-8C97FE7E9062}\").pv',
# beta edge
r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge Beta\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge Beta\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft\Edge Beta\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Microsoft\Edge Beta\BLBeacon").version',
r'(Get-Item -Path \"$env:LOCALAPPDATA\Microsoft\Edge Beta\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES\Microsoft\Edge Beta\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES (x86)\Microsoft\Edge Beta\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::\"HKCU\SOFTWARE\Microsoft\Edge Beta\BLBeacon\").version',
# dev edge
r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge Dev\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge Dev\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft\Edge Dev\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Microsoft\Edge Dev\BLBeacon").version',
r'(Get-Item -Path \"$env:LOCALAPPDATA\Microsoft\Edge Dev\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES\Microsoft\Edge Dev\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES (x86)\Microsoft\Edge Dev\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::\"HKCU\SOFTWARE\Microsoft\Edge Dev\BLBeacon\").version',
# canary edge
r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge SxS\Application\msedge.exe").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Microsoft\Edge SxS\BLBeacon").version',
r'(Get-Item -Path \"$env:LOCALAPPDATA\Microsoft\Edge SxS\Application\msedge.exe\").VersionInfo.FileVersion',
r'(Get-ItemProperty -Path Registry::\"HKCU\SOFTWARE\Microsoft\Edge SxS\BLBeacon\").version',
# highest edge
r"(Get-Item (Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe').'(Default)').VersionInfo.ProductVersion",
r"[System.Diagnostics.FileVersionInfo]::GetVersionInfo((Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe').'(Default)').ProductVersion",
r"Get-AppxPackage -Name *MicrosoftEdge.* | Foreach Version",
r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge").version',
r'(Get-ItemProperty -Path Registry::\"HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge\").version',
),
},
"firefox": {
OSType.LINUX: linux_browser_apps_to_cmd("firefox"),
OSType.MAC: r"/Applications/Firefox.app/Contents/MacOS/firefox --version",
OSType.WIN: windows_browser_apps_to_cmd(
r'(Get-Item -Path "$env:PROGRAMFILES\Mozilla Firefox\firefox.exe").VersionInfo.FileVersion',
r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Mozilla Firefox\firefox.exe").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES\Mozilla Firefox\firefox.exe\").VersionInfo.FileVersion',
r'(Get-Item -Path \"$env:PROGRAMFILES (x86)\Mozilla Firefox\firefox.exe\").VersionInfo.FileVersion',
r"(Get-Item (Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe').'(Default)').VersionInfo.ProductVersion",
r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE\Mozilla\Mozilla Firefox").CurrentVersion',
r'(Get-ItemProperty -Path Registry::\"HKLM\SOFTWARE\Mozilla\Mozilla Firefox\").CurrentVersion',
),
},
}
Expand Down