Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

.github/workflows/src/release-build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -xe
 

locales/update-supported-languages.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 LANGS_FILE="./supported-languages"
 
 # Clean up the file

scripts/download-language-packs.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

scripts/fetch-formal-git-components.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

scripts/recalculate-patches.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -12,6 +12,9 @@ IGNORE_FILES=(
   "shared.nsh"
   "ignorePrefs.json"
   "moz.configure"
+  "AsyncShutdown.sys.mjs"
+  "Info.plist.in"
+  "firefox.js"
 )
 
 # Recursively find all .patch files in the current directory and its subdirectories

scripts/remove-failed-jobs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

scripts/update-surfer.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

src/browser/app/macbuild/Contents/Info-plist-in.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
-index 0c4fb837a24490c66b284abf2bd9299c2e021de0..ea28831b90662b12bdcb137c35b6bb83626c77e7 100644
---- a/browser/app/macbuild/Contents/Info.plist.in
-+++ b/browser/app/macbuild/Contents/Info.plist.in
-@@ -190,8 +190,6 @@
- 	<string>@MAC_APP_NAME@ @APP_VERSION@</string>
- 	<key>CFBundleIconFile</key>
- 	<string>firefox.icns</string>
--	<key>CFBundleIconName</key>
--	<string>AppIcon</string>
- 	<key>CFBundleIdentifier</key>
- 	<string>@MOZ_MACBUNDLE_ID@</string>
- 	<key>CFBundleInfoDictionaryVersion</key>

src/browser/themes/shared/zen-icons/update-resources.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch

@@ -1,28 +0,0 @@
-diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs
-index 2aaef80411b2cef9563c49f23d36b08222b06b03..7bd15ebb0d9d09da57a287b47beb1f0e2e17d229 100644
---- a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs
-+++ b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs
-@@ -492,6 +492,23 @@ function getPhase(topic) {
-       }
-       return undefined;
-     },
-+
-+    /**
-+     * Reset the phase after a call to _trigger().
-+     * For testing purposes only.
-+     */
-+    get _reset() {
-+      let accepted = Services.prefs.getBoolPref(
-+        "toolkit.asyncshutdown.testing",
-+        false
-+      );
-+      if (accepted) {
-+        return () => {
-+          spinner = new Spinner(topic);
-+        };
-+      }
-+      return undefined;
-+    },
-   });
-   gPhases.set(topic, phase);
-   return phase;