Fix patching Win32 updater with OpenAsar (#1667)

This is more generic rewrite allowing for more paths to be added in the future for whatever reason (like a rename in future Discord versions).

(The "OpenAsar" code previously was completely wrong)
main
CanadaHonk 1 year ago committed by GitHub
parent ccd2ce8baf
commit d582e61ec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { app, autoUpdater } from "electron"; import { app } from "electron";
import { existsSync, mkdirSync, readdirSync, renameSync, statSync, writeFileSync } from "fs"; import { existsSync, mkdirSync, readdirSync, renameSync, statSync, writeFileSync } from "fs";
import { basename, dirname, join } from "path"; import { basename, dirname, join } from "path";
@ -80,20 +80,22 @@ function patchLatest() {
// Windows Host Updates install to a new folder app-{HOST_VERSION}, so we // Windows Host Updates install to a new folder app-{HOST_VERSION}, so we
// need to reinject // need to reinject
function patchUpdater() { function patchUpdater() {
try { // Array of autoStart paths to try
const autoStartScript = join(require.main!.filename, "..", "autoStart", "win32.js"); const autoStartPaths = [
const { update } = require(autoStartScript); join(require.main!.filename, "..", "autoStart", "win32.js"), // Vanilla
join(require.main!.filename, "..", "autoStart.js") // OpenAsar
require.cache[autoStartScript]!.exports.update = function () { ];
update.apply(this, arguments);
patchLatest(); for (const path of autoStartPaths) {
}; try {
} catch { const { update } = require(path);
// OpenAsar uses electrons autoUpdater on Windows
const { quitAndInstall } = autoUpdater; require.cache[path]!.exports.update = function () {
autoUpdater.quitAndInstall = function () { update.apply(this, arguments);
patchLatest(); patchLatest();
quitAndInstall.call(this); };
}; } catch {
// Ignore as non-critical
}
} }
} }

Loading…
Cancel
Save