mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-13 14:44:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix chrome profile precedence order to be equal

Browse source
This commit is contained in:
Nick Sweeting 2019-03-22 21:31:55 -04:00
parent bd9f3e313f
commit 8f73fdbe09
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
archivebox/config.py
View file

@ -77,15 +77,18 @@ if not CHROME_BINARY:
common_chrome_executable_names = ( common_chrome_executable_names = (
'chromium-browser', 'chromium-browser',
'chromium', 'chromium',
'google-chrome',
'google-chrome-stable',
'google-chrome-unstable',
'google-chrome-beta',
'google-chrome-canary',
'google-chrome-dev',
'/Applications/Chromium.app/Contents/MacOS/Chromium', '/Applications/Chromium.app/Contents/MacOS/Chromium',
'google-chrome',
'/Applications/Google Chrome.app/Contents/MacOS/Google Chrome', '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
'google-chrome-stable',
'google-chrome-beta',
'google-chrome-unstable',
'google-chrome-dev',
'google-chrome-canary',
'/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary', '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
) )
for name in common_chrome_executable_names: for name in common_chrome_executable_names:
full_path_exists = shutil.which(name) full_path_exists = shutil.which(name)

8
archivebox/util.py
View file

@ -630,14 +630,14 @@ def chrome_args(binary=CHROME_BINARY, user_data_dir=CHROME_USER_DATA_DIR,
# Find chrome user data directory # Find chrome user data directory
default_profile_paths = ( default_profile_paths = (
'~/.config/chromium', '~/.config/chromium',
'~/Library/Application Support/Chromium',
'~/AppData/Local/Chromium/User Data',
'~/.config/google-chrome', '~/.config/google-chrome',
'~/Library/Application Support/Google/Chrome',
'~/AppData/Local/Google/Chrome/User Data',
'~/.config/google-chrome-beta', '~/.config/google-chrome-beta',
'~/.config/google-chrome-unstable', '~/.config/google-chrome-unstable',
'~/Library/Application Support/Chromium',
'~/Library/Application Support/Google/Chrome',
'~/Library/Application Support/Google/Chrome Canary', '~/Library/Application Support/Google/Chrome Canary',
'~/AppData/Local/Chromium/User Data',
'~/AppData/Local/Google/Chrome/User Data',
'~/AppData/Local/Google/Chrome SxS/User Data', '~/AppData/Local/Google/Chrome SxS/User Data',
) )
if user_data_dir: if user_data_dir: