ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

Fix patching Win32 updater with OpenAsar (#1667)

Browse source 
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)
This commit is contained in:
CanadaHonk 2023-08-18 23:54:35 +01:00 committed by GitHub
parent ccd2ce8baf
commit d582e61ec3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/patchWin32Updater.ts
View file

@ -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 () { for (const path of autoStartPaths) {
update.apply(this, arguments); try {
patchLatest(); const { update } = require(path);
};
} catch { require.cache[path]!.exports.update = function () {
// OpenAsar uses electrons autoUpdater on Windows update.apply(this, arguments);
const { quitAndInstall } = autoUpdater; patchLatest();
autoUpdater.quitAndInstall = function () { };
patchLatest(); } catch {
quitAndInstall.call(this); // Ignore as non-critical
}; }
} }
} }