From 50adc32356d707f20adcefcfcdf11ccbeebde7dc Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Fri, 1 Dec 2023 19:26:33 +0100 Subject: [PATCH] patch: fix sudo for mac catalina and above --- forge.config.ts | 4 ++++ lib/shared/catalina-sudo/sudo.ts | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forge.config.ts b/forge.config.ts index b06c02fe..17c3d099 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -41,6 +41,10 @@ const config: ForgeConfig = { appCopyright: 'Copyright 2016-2023 Balena Ltd', darwinDarkModeSupport: true, protocols: [{ name: 'etcher', schemes: ['etcher'] }], + extraResource: [ + "lib/shared/catalina-sudo/sudo-askpass.osascript-zh.js", + "lib/shared/catalina-sudo/sudo-askpass.osascript-en.js" + ], osxSign: { optionsForFile: () => ({ entitlements: './entitlements.mac.plist', diff --git a/lib/shared/catalina-sudo/sudo.ts b/lib/shared/catalina-sudo/sudo.ts index 632aaa71..f5efa7ca 100644 --- a/lib/shared/catalina-sudo/sudo.ts +++ b/lib/shared/catalina-sudo/sudo.ts @@ -19,7 +19,6 @@ import { join } from 'path'; import { env } from 'process'; import { promisify } from 'util'; -import { getAppPath } from '../get-app-path'; import { supportedLocales } from '../../gui/app/i18n'; const execFileAsync = promisify(execFile); @@ -48,8 +47,7 @@ export async function sudo( env: { PATH: env.PATH, SUDO_ASKPASS: join( - getAppPath(), - __dirname, + process.resourcesPath, `sudo-askpass.osascript-${lang}.js`, ), },