From eeefd1cc0decb3975a3ecb555da90f484f79eae3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 31 Mar 2024 06:25:30 -0400 Subject: [PATCH] Fix fetch_xulrunner error on Windows after 982d08798 --- app/scripts/fetch_xulrunner | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner index 71cc5b41bc..622b427a70 100755 --- a/app/scripts/fetch_xulrunner +++ b/app/scripts/fetch_xulrunner @@ -162,8 +162,10 @@ function modify_omni { # Disable unwanted components remove_line '(RemoteSettings|services-|telemetry|Telemetry|URLDecorationAnnotationsService)' components/components.manifest - # Ignore relative paths in PATH in Subprocess.pathSearch(), used when bare command is passed to Utilities.Internal.subprocess() - replace_line 'let path = PathUtils.join\(dir, bin\);' 'if (!dir.startsWith("\/")) continue; let path = PathUtils.join(dir, bin);' modules/subprocess/subprocess_unix.sys.mjs + # On Mac/Linux, ignore relative paths in PATH in Subprocess.pathSearch(), used when a bare command is passed to Utilities.Internal.subprocess() + if [[ $1 != win* ]]; then + replace_line 'let path = PathUtils.join\(dir, bin\);' 'if (!dir.startsWith("\/")) continue; let path = PathUtils.join(dir, bin);' modules/subprocess/subprocess_unix.sys.mjs + fi # Remove unwanted files rm modules/FxAccounts*