updater: rewrite openasar retaining
This commit is contained in:
parent
78b49c092c
commit
edb6a5b4fe
|
@ -146,10 +146,9 @@ class Updater extends require('events').EventEmitter {
|
||||||
if (next != cur && !options?.allowObsoleteHost) {
|
if (next != cur && !options?.allowObsoleteHost) {
|
||||||
// Retain OpenAsar
|
// Retain OpenAsar
|
||||||
const fs = require('original-fs');
|
const fs = require('original-fs');
|
||||||
|
|
||||||
const getAsar = (p) => join(p, '..', 'resources', 'app.asar');
|
const cAsar = join(require.main.filename, '..');
|
||||||
const cAsar = getAsar(cur);
|
const nAsar = join(next, '..', 'resources', 'app.asar');
|
||||||
const nAsar = getAsar(next);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
fs.copyFileSync(nAsar, nAsar + '.backup'); // Copy new app.asar to backup file (<new>/app.asar -> <new>/app.asar.backup)
|
fs.copyFileSync(nAsar, nAsar + '.backup'); // Copy new app.asar to backup file (<new>/app.asar -> <new>/app.asar.backup)
|
||||||
|
@ -157,7 +156,7 @@ class Updater extends require('events').EventEmitter {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log('Updater', 'Failed to retain OpenAsar', e);
|
log('Updater', 'Failed to retain OpenAsar', e);
|
||||||
}
|
}
|
||||||
|
|
||||||
app.once('will-quit', () => spawn(next, [], {
|
app.once('will-quit', () => spawn(next, [], {
|
||||||
detached: true,
|
detached: true,
|
||||||
stdio: 'inherit'
|
stdio: 'inherit'
|
||||||
|
@ -341,14 +340,14 @@ module.exports = {
|
||||||
tryInitUpdater: (buildInfo, repository_url) => {
|
tryInitUpdater: (buildInfo, repository_url) => {
|
||||||
const root_path = paths.getInstallPath();
|
const root_path = paths.getInstallPath();
|
||||||
if (root_path == null) return false;
|
if (root_path == null) return false;
|
||||||
|
|
||||||
instance = new Updater({
|
instance = new Updater({
|
||||||
release_channel: buildInfo.releaseChannel,
|
release_channel: buildInfo.releaseChannel,
|
||||||
platform: process.platform === 'win32' ? 'win' : 'osx',
|
platform: process.platform === 'win32' ? 'win' : 'osx',
|
||||||
repository_url,
|
repository_url,
|
||||||
root_path
|
root_path
|
||||||
});
|
});
|
||||||
|
|
||||||
return instance.valid;
|
return instance.valid;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue