Use new Firefox 62 method to install uBlock Origin

.bin/Scripts/functions/browsers.py

@@ -46,6 +46,9 @@ UBO_CHROME_REG =        r'Software\Wow6432Node\Google\Chrome\Extensions\cjpalhdl
 UBO_EXTRA_CHROME =      'https://chrome.google.com/webstore/detail/ublock-origin-extra/pgdnlhfefecpicbbihgmbmffkjpaplco?hl=en'
 UBO_EXTRA_CHROME_REG =  r'Software\Wow6432Node\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco'
 UBO_MOZILLA =           'https://addons.mozilla.org/en-us/firefox/addon/ublock-origin/'
+UBO_MOZZILA_PATH =      r'{}\Mozilla Firefox\distribution\extensions\ublock_origin.xpi'.format(os.environ.get('PROGRAMFILES'))
+UBO_MOZILLA_REG =       r'Software\Mozilla\Firefox\Extensions'
+UBO_MOZILLA_REG_NAME =  'uBlock0@raymondhill.net'
 UBO_OPERA =             'https://addons.opera.com/en/extensions/details/ublock/?display=en'
 SUPPORTED_BROWSERS = {
     'Internet Explorer': {
@@ -369,14 +372,17 @@ def install_adblock(indent=8, width=32):
                     urls.append(UBO_EXTRA_CHROME)
             
             elif browser_data[browser]['base'] == 'mozilla':
-                # Assume UBO is not installed first and change if it is
+                # Check for system extensions
-                urls.append(UBO_MOZILLA)
+                try:
-                if browser == 'Mozilla Firefox':
+                    with winreg.OpenKey(HKLM, UBO_MOZILLA_REG) as key:
-                    ubo = browser_data[browser]['exe_path'].replace(
+                        winreg.QueryValueEx(key, UBO_MOZILLA_REG_NAME)
-                        'firefox.exe',
+                except FileNotFoundError:
-                        r'distribution\extensions\uBlock0@raymondhill.net')
+                    urls = [UBO_MOZILLA]
-                    if os.path.exists(ubo):
+                else:
+                    if os.path.exists(UBO_MOZZILA_PATH):
                         urls = ['about:addons']
+                    else:
+                        urls = [UBO_MOZILLA]
             
             elif browser_data[browser]['base'] == 'ie':
                 urls.append(IE_GALLERY)

.bin/Scripts/functions/setup.py

@@ -5,6 +5,9 @@ from functions.common import *
 # STATIC VARIABLES
 HKCU = winreg.HKEY_CURRENT_USER
 HKLM = winreg.HKEY_LOCAL_MACHINE
+MOZILLA_FIREFOX_UBO_PATH = r'{}\{}\ublock_origin.xpi'.format(
+    os.environ.get('PROGRAMFILES'),
+    r'Mozilla Firefox\distribution\extensions')
 OTHER_RESULTS = {
     'Error': {
         'CalledProcessError':   'Unknown Error',
@@ -76,9 +79,6 @@ SETTINGS_EXPLORER_USER = {
         },
     }
 SETTINGS_GOOGLE_CHROME = {
-    r'Software\Google\Chrome\Extensions': {
-        'WOW64_32': True,
-        },
     r'Software\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm': {
         'SZ Items': {
             'update_url': 'https://clients2.google.com/service/update2/crx'},
@@ -90,6 +90,19 @@ SETTINGS_GOOGLE_CHROME = {
         'WOW64_32': True,
         },
     }
+SETTINGS_MOZILLA_FIREFOX_32 = {
+    r'Software\Mozilla\Firefox\Extensions': {
+        'SZ Items': {
+            'uBlock0@raymondhill.net': MOZILLA_FIREFOX_UBO_PATH},
+        'WOW64_32': True,
+        },
+    }
+SETTINGS_MOZILLA_FIREFOX_64 = {
+    r'Software\Mozilla\Firefox\Extensions': {
+        'SZ Items': {
+            'uBlock0@raymondhill.net': MOZILLA_FIREFOX_UBO_PATH},
+        },
+    }
 VCR_REDISTS = [
     {'Name': 'Visual C++ 2008 SP1 x32...',
         'Cmd': [r'2008sp1\x32\vcredist.exe', '/qb! /norestart']},
@@ -221,7 +234,7 @@ def install_adobe_reader():
     run_program(cmd)
 
 def install_chrome_extensions():
-    """Update registry to 'install' Google Chrome extensions for all users."""
+    """Update registry to install Google Chrome extensions for all users."""
     write_registry_settings(SETTINGS_GOOGLE_CHROME, all_users=True)
 
 def install_classicstart_skin():
@@ -238,16 +251,20 @@ def install_classicstart_skin():
     shutil.copy(source, dest)
 
 def install_firefox_extensions():
-    """Extract Firefox extensions to installation folder."""
+    """Update registry to install Firefox extensions for all users."""
     dist_path = r'{PROGRAMFILES}\Mozilla Firefox\distribution\extensions'.format(
         **global_vars['Env'])
     source_path = r'{CBinDir}\FirefoxExtensions.7z'.format(**global_vars)
     if not os.path.exists(source_path):
         raise FileNotFoundError
+
+    # Update registry
+    write_registry_settings(SETTINGS_MOZILLA_FIREFOX_32, all_users=True)
+    write_registry_settings(SETTINGS_MOZILLA_FIREFOX_64, all_users=True)
     
     # Extract extension(s) to distribution folder
     cmd = [
-        global_vars['Tools']['SevenZip'], 'x', '-aos', '-bso0', '-bse0',
+        global_vars['Tools']['SevenZip'], 'e', '-aos', '-bso0', '-bse0',
         '-p{ArchivePassword}'.format(**global_vars),
         '-o{dist_path}'.format(dist_path=dist_path),
         source_path]

.bin/Scripts/functions/update.py

@@ -720,16 +720,10 @@ def update_firefox_ublock_origin():
     remove_from_kit('FirefoxExtensions')
     
     # Download
-    download_to_temp('ff-uBO.xpi', SOURCE_URLS['Firefox uBO'])
+    download_generic(
-    
+        r'{}\FirefoxExtensions'.format(global_vars['CBinDir']),
-    # Extract files
+        'ublock_origin.xpi',
-    extract_generic(
+        SOURCE_URLS['Firefox uBO'])
-        r'{}\ff-uBO.xpi'.format(global_vars['TmpDir']),
-        r'{}\FirefoxExtensions\uBlock0@raymondhill.net'.format(
-            global_vars['CBinDir']))
-    
-    # Cleanup
-    remove_from_temp('ff-uBO.xpi')
 
 def update_notepadplusplus():
     # Stop running processes