| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 # coding: utf-8 | 2 # coding: utf-8 | 
| 3 | 3 | 
| 4 import argparse | 4 import argparse | 
| 5 import datetime | 5 import datetime | 
| 6 import errno | 6 import errno | 
| 7 import hashlib | 7 import hashlib | 
| 8 import io | 8 import io | 
| 9 import json | 9 import json | 
| 10 import os | 10 import os | 
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 129       os.close(handle) | 129       os.close(handle) | 
| 130       cleanup.append(abpxpi) | 130       cleanup.append(abpxpi) | 
| 131       packager.createBuild(parameters.abpdir, outFile=abpxpi, releaseBuild=True) | 131       packager.createBuild(parameters.abpdir, outFile=abpxpi, releaseBuild=True) | 
| 132 | 132 | 
| 133     profile = FirefoxProfile( | 133     profile = FirefoxProfile( | 
| 134       addons=[ | 134       addons=[ | 
| 135         crawlerxpi, | 135         crawlerxpi, | 
| 136         abpxpi, | 136         abpxpi, | 
| 137       ], | 137       ], | 
| 138       preferences={ | 138       preferences={ | 
|  | 139         'browser.startup.homepage': 'about:blank', | 
| 139         'browser.tabs.warnOnCloseOtherTabs': False, | 140         'browser.tabs.warnOnCloseOtherTabs': False, | 
| 140         'browser.uitour.enabled': False, | 141         'browser.uitour.enabled': False, | 
| 141         'prompts.tab_modal.enabled': False, | 142         'prompts.tab_modal.enabled': False, | 
|  | 143         'startup.homepage_welcome_url': 'about:blank', | 
|  | 144         'startup.homepage_welcome_url.additional': 'about:blank', | 
| 142         'xpinstall.signatures.required': False, | 145         'xpinstall.signatures.required': False, | 
| 143       } | 146       } | 
| 144     ) | 147     ) | 
| 145 | 148 | 
| 146     abpsettings = os.path.join(profile.profile, 'adblockplus') | 149     abpsettings = os.path.join(profile.profile, 'adblockplus') | 
| 147     os.makedirs(abpsettings) | 150     os.makedirs(abpsettings) | 
| 148     with open(os.path.join(abpsettings, 'patterns.ini'), 'w') as handle: | 151     with open(os.path.join(abpsettings, 'patterns.ini'), 'w') as handle: | 
| 149       print >>handle, '# Adblock Plus preferences' | 152       print >>handle, '# Adblock Plus preferences' | 
| 150       print >>handle, 'version=4' | 153       print >>handle, 'version=4' | 
| 151       for url in parameters.filters: | 154       for url in parameters.filters: | 
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 191   BASE_DIR = os.path.dirname(os.path.abspath(__file__)) | 194   BASE_DIR = os.path.dirname(os.path.abspath(__file__)) | 
| 192   DEPENDENCY_SCRIPT = os.path.join(BASE_DIR, "ensure_dependencies.py") | 195   DEPENDENCY_SCRIPT = os.path.join(BASE_DIR, "ensure_dependencies.py") | 
| 193 | 196 | 
| 194   try: | 197   try: | 
| 195     subprocess.check_call([sys.executable, DEPENDENCY_SCRIPT, BASE_DIR]) | 198     subprocess.check_call([sys.executable, DEPENDENCY_SCRIPT, BASE_DIR]) | 
| 196   except subprocess.CalledProcessError as e: | 199   except subprocess.CalledProcessError as e: | 
| 197     print >>sys.stderr, e | 200     print >>sys.stderr, e | 
| 198     print >>sys.stderr, "Failed to ensure dependencies being up-to-date!" | 201     print >>sys.stderr, "Failed to ensure dependencies being up-to-date!" | 
| 199 | 202 | 
| 200   run() | 203   run() | 
| OLD | NEW | 
|---|