firefox: extract instead of running installer (#1079)

* firefox: extract instead of running installer * firefox-esr: checkver on older ESR track
ScoopInstaller · Jul 25, 2018 · 611d98f · 611d98f
1 parent 191266e
commit 611d98f
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 70 deletions.
diff --git a/firefox-beta.json b/firefox-beta.json
@@ -1,16 +1,18 @@
 {
+    "description": "Beta builds of Firefox: the popular open source web browser.",
     "homepage": "https://www.mozilla.org/en-US/firefox/beta/",
     "version": "nightly",
+    "license": "MPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=win64&lang=en-US#/firefox-setup.exe"
+            "url": "https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=win64&lang=en-US#/firefox.7z"
         },
         "32bit": {
-            "url": "https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=win&lang=en-US#/firefox-setup.exe"
+            "url": "https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=win&lang=en-US#/firefox.7z"
         }
     },
+    "extract_dir": "core",
     "bin": [
-        "firefox.exe",
         [
             "firefox.exe",
             "firefox-beta"
@@ -21,14 +23,5 @@
             "firefox.exe",
             "Firefox Beta"
         ]
-    ],
-    "pre_install": "echo \"[Install]`nInstallDirectoryPath=$dir`nQuickLaunchShortcut=false`nDesktopShortcut=false`nStartMenuShortcuts=false\" | sc \"$dir\\install.ini\"",
-    "installer": {
-        "file": "firefox-setup.exe",
-        "args": "/INI=$dir\\install.ini"
-    },
-    "uninstaller": {
-        "file": "uninstall\\helper.exe",
-        "args": "/S"
-    }
+    ]
 }
diff --git a/firefox-developer.json b/firefox-developer.json
@@ -1,16 +1,18 @@
 {
+    "description": "Developer builds of Firefox: the popular open source web browser.",
     "homepage": "https://www.mozilla.org/en-US/firefox/developer/",
     "version": "nightly",
+    "license": "MPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=win64&lang=en-US#/firefox-setup.exe"
+            "url": "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=win64&lang=en-US#/firefox.7z"
         },
         "32bit": {
-            "url": "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=win&lang=en-US#/firefox-setup.exe"
+            "url": "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=win&lang=en-US#/firefox.7z"
         }
     },
+    "extract_dir": "core",
     "bin": [
-        "firefox.exe",
         [
             "firefox.exe",
             "firefox-dev"
@@ -25,14 +27,5 @@
             "firefox.exe",
             "Firefox Developer Edition"
         ]
-    ],
-    "pre_install": "echo \"[Install]`nInstallDirectoryPath=$dir`nQuickLaunchShortcut=false`nDesktopShortcut=false`nStartMenuShortcuts=false\" | sc \"$dir\\install.ini\"",
-    "installer": {
-        "file": "firefox-setup.exe",
-        "args": "/INI=$dir\\install.ini"
-    },
-    "uninstaller": {
-        "file": "uninstall\\helper.exe",
-        "args": "/S"
-    }
+    ]
 }
diff --git a/firefox-esr.json b/firefox-esr.json
@@ -1,18 +1,20 @@
 {
+    "description": "Extended Support Release of Firefox: the popular open source web browser.",
     "homepage": "https://www.mozilla.org/en-US/firefox/organizations/",
-    "version": "52.7.4",
+    "version": "52.9.0",
+    "license": "MPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://download.mozilla.org/?product=firefox-52.7.4esr-SSL&os=win64&lang=en-US#/firefox-setup.exe",
-            "hash": "139cee15bb98c070212fc94137cffb5d056495f8dd34a7e5cfaf3bcd06f91335"
+            "url": "https://download.mozilla.org/?product=firefox-52.9.0esr-SSL&os=win64&lang=en-US#/firefox.7z",
+            "hash": "8bffe514bc17d0cf81c75c241c3453a80d0500b8d86646e3bd005ecc12ad86cb"
         },
         "32bit": {
-            "url": "https://download.mozilla.org/?product=firefox-52.7.4esr-SSL&os=win&lang=en-US#/firefox-setup.exe",
-            "hash": "b5eb043293bac64aa60331e44ce344e63c1601e3bcf9da706b7a1f8a475bbe34"
+            "url": "https://download.mozilla.org/?product=firefox-52.9.0esr-SSL&os=win&lang=en-US#/firefox.7z",
+            "hash": "6ec090bcf8d8ec23820bc41dd548f56f10990b8d40c151cce8a641687a92b1c2"
         }
     },
+    "extract_dir": "core",
     "bin": [
-        "firefox.exe",
         [
             "firefox.exe",
             "firefox-esr"
@@ -24,30 +26,25 @@
             "Mozilla Firefox"
         ]
     ],
-    "pre_install": "echo \"[Install]`nInstallDirectoryPath=$dir\" | sc \"$dir\\install.ini\"",
-    "installer": {
-        "file": "firefox-setup.exe",
-        "args": "/INI=$dir\\install.ini"
-    },
-    "uninstaller": {
-        "file": "uninstall\\helper.exe",
-        "args": "/S"
-    },
+    "##": [
+        "At certain times of year there are two 'current' ESR versions, and we want the OLDER one.",
+        "See https://github.com/lukesampson/scoop-extras/pull/1079#issuecomment-407587329 for details."
+    ],
     "checkver": {
         "url": "https://www.mozilla.org/en-US/firefox/organizations/all/",
-        "re": "data-esr-versions=\"([\\d.]+)\""
+        "re": "data-esr-versions=\"([0-9]+(\\.[0-9]+)*)( [0-9]+(\\.[0-9]+)*)?\""
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://download.mozilla.org/?product=firefox-$versionesr-SSL&os=win64&lang=en-US#/firefox-setup.exe",
+                "url": "https://download.mozilla.org/?product=firefox-$versionesr-SSL&os=win64&lang=en-US#/firefox.7z",
                 "hash": {
                     "find": "([a-fA-F0-9]{64})\\s+(?:win64/en-US/Firefox Setup ([\\d.]+)esr.exe)",
                     "url": "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$versionesr/SHA256SUMS"
                 }
             },
             "32bit": {
-                "url": "https://download.mozilla.org/?product=firefox-$versionesr-SSL&os=win&lang=en-US#/firefox-setup.exe",
+                "url": "https://download.mozilla.org/?product=firefox-$versionesr-SSL&os=win&lang=en-US#/firefox.7z",
                 "hash": {
                     "find": "([a-fA-F0-9]{64})\\s+(?:win32/en-US/Firefox Setup ([\\d.]+)esr.exe)",
                     "url": "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$versionesr/SHA256SUMS"

diff --git a/firefox-nightly.json b/firefox-nightly.json
@@ -1,16 +1,18 @@
 {
+    "description": "Nightly builds of Firefox: the popular open source web browser.",
     "homepage": "https://www.mozilla.org/en-US/firefox/nightly/",
     "version": "nightly",
+    "license": "MPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=win64&lang=en-US#/firefox-setup.exe"
+            "url": "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=win64&lang=en-US#/firefox.7z"
         },
         "32bit": {
-            "url": "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=win&lang=en-US#/firefox-setup.exe"
+            "url": "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=win&lang=en-US#/firefox.7z"
         }
     },
+    "extract_dir": "core",
     "bin": [
-        "firefox.exe",
         [
             "firefox.exe",
             "firefox-nightly"
@@ -21,14 +23,5 @@
             "firefox.exe",
             "Firefox Nightly"
         ]
-    ],
-    "pre_install": "echo \"[Install]`nInstallDirectoryPath=$dir`nQuickLaunchShortcut=false`nDesktopShortcut=false`nStartMenuShortcuts=false\" | sc \"$dir\\install.ini\"",
-    "installer": {
-        "file": "firefox-setup.exe",
-        "args": "/INI=$dir\\install.ini"
-    },
-    "uninstaller": {
-        "file": "uninstall\\helper.exe",
-        "args": "/S"
-    }
+    ]
 }
diff --git a/firefox.json b/firefox.json
@@ -1,47 +1,41 @@
 {
+    "description": "Popular open source web browser. Cross-platform and available in many languages.",
     "homepage": "https://www.mozilla.org/en-US/firefox/new/",
     "version": "61.0.1",
+    "license": "MPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://download.mozilla.org/?product=firefox-61.0.1-SSL&os=win64&lang=en-US#/firefox-setup.exe",
+            "url": "https://download.mozilla.org/?product=firefox-61.0.1-SSL&os=win64&lang=en-US#/firefox.7z",
             "hash": "ea22dcce88fc587e58e4d442bb3f1506559cada6cb653100c63a7cd84716176a"
         },
         "32bit": {
-            "url": "https://download.mozilla.org/?product=firefox-61.0.1-SSL&os=win&lang=en-US#/firefox-setup.exe",
+            "url": "https://download.mozilla.org/?product=firefox-61.0.1-SSL&os=win&lang=en-US#/firefox.7z",
             "hash": "511fc558017a485157fce8fd0ef46eb262815cbf616f229b4da90918121050e8"
         }
     },
+    "extract_dir": "core",
     "bin": "firefox.exe",
     "shortcuts": [
         [
             "firefox.exe",
             "Mozilla Firefox"
         ]
     ],
-    "pre_install": "echo \"[Install]`nInstallDirectoryPath=$dir`nQuickLaunchShortcut=false`nDesktopShortcut=false`nStartMenuShortcuts=false\" | sc \"$dir\\install.ini\"",
-    "installer": {
-        "file": "firefox-setup.exe",
-        "args": "/INI=$dir\\install.ini"
-    },
-    "uninstaller": {
-        "file": "uninstall\\helper.exe",
-        "args": "/S"
-    },
     "checkver": {
         "url": "https://www.mozilla.org/en-US/firefox/all/",
         "re": "data-latest-firefox=\"([\\d.]+)\""
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://download.mozilla.org/?product=firefox-$version-SSL&os=win64&lang=en-US#/firefox-setup.exe",
+                "url": "https://download.mozilla.org/?product=firefox-$version-SSL&os=win64&lang=en-US#/firefox.7z",
                 "hash": {
                     "find": "([a-fA-F0-9]{64})\\s+(?:win64/en-US/Firefox Setup ([\\d.]+).exe)",
                     "url": "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$version/SHA256SUMS"
                 }
             },
             "32bit": {
-                "url": "https://download.mozilla.org/?product=firefox-$version-SSL&os=win&lang=en-US#/firefox-setup.exe",
+                "url": "https://download.mozilla.org/?product=firefox-$version-SSL&os=win&lang=en-US#/firefox.7z",
                 "hash": {
                     "find": "([a-fA-F0-9]{64})\\s+(?:win32/en-US/Firefox Setup ([\\d.]+).exe)",
                     "url": "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$version/SHA256SUMS"