OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8911 from vector-im/t3chguy/no-update 

Allow disabling update mechanism
pull/8983/head
Travis Ralston 2019-02-24 18:00:54 -07:00 committed by GitHub
parent 9e11c70416 ffacf30722
commit a5a4c167e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
electron_app/src/electron-main.js
View File

@ -157,6 +157,7 @@ ipcMain.on('ipcCall', async function(ev, payload) {
} else { } else {
mainWindow.focus(); mainWindow.focus();
} }
break;
case 'origin_migrate': case 'origin_migrate':
migratingOrigin = true; migratingOrigin = true;
await migrateFromOldOrigin(); await migrateFromOldOrigin();
@ -272,10 +273,12 @@ app.on('ready', () => {
path: absTarget, path: absTarget,
}); });
}, (error) => { }, (error) => {
if (error) console.error('Failed to register protocol') if (error) console.error('Failed to register protocol');
}); });
if (vectorConfig['update_base_url']) { if (argv['no-update']) {
console.log('Auto update disabled via command line flag "--no-update"');
} else if (vectorConfig['update_base_url']) {
console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`); console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`);
updater.start(vectorConfig['update_base_url']); updater.start(vectorConfig['update_base_url']);
} else { } else {