π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fix macOS desktop signing keychain password
Manav Rathi515474eed36e
diff --git a/desktop/scripts/patch-electron-builder.mjs b/desktop/scripts/patch-electron-builder.mjsnew file mode 100644index 0000000000..d55089b56b--- /dev/null+++ b/desktop/scripts/patch-electron-builder.mjs@@ -0,0 +1,39 @@+import { readFileSync, writeFileSync } from "node:fs";++// Remove once electron-builder ships https://github.com/electron-userland/electron-builder/pull/10172.+const { version } = JSON.parse(+ readFileSync("node_modules/app-builder-lib/package.json", "utf8"),+);+if (version !== "26.15.3")+ throw new Error(+ `app-builder-lib ${version}: review or remove the keychain patch`,+ );++const file = "node_modules/app-builder-lib/out/codeSign/macCodeSign.js";+let source = readFileSync(file, "utf8");++const replacements = [+ [+ "importCerts(keychainFile, certPaths, cscPasswords)",+ "importCerts(keychainFile, certPaths, cscPasswords, keychainPassword)",+ ],+ [+ "async function importCerts(keychainFile, paths, keyPasswords)",+ "async function importCerts(keychainFile, paths, keyPasswords, keychainPassword)",+ ],+ [+ '"-s", "-k", password, keychainFile',+ '"-s", "-k", keychainPassword, keychainFile',+ ],+];++for (const [before, after] of replacements) {+ if (source.includes(after)) continue;+ if (!source.includes(before))+ throw new Error(+ "electron-builder signing code changed; review the keychain patch",+ );+ source = source.replace(before, after);+}++writeFileSync(file, source);diff --git a/desktop/scripts/postinstall.mjs b/desktop/scripts/postinstall.mjsindex 3e0373649f..3cd65015ac 100644--- a/desktop/scripts/postinstall.mjs+++ b/desktop/scripts/postinstall.mjs@@ -24,6 +24,7 @@ const run = (cmd) => {execSync(cmd, { stdio: "inherit" });};+run("node scripts/patch-electron-builder.mjs");run("npm rebuild --ignore-scripts=false ffmpeg-static electron-winstaller");run("npm exec -- electron-builder install-app-deps");run("node scripts/vips.js");