Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-06 02:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14049 from birarda/security-vuln

Browse source 
update some server console dependencies after npm audit
This commit is contained in:
Stephen Birarda 2018-10-23 10:45:54 -07:00 committed by GitHub
commit b007e4d874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 906 additions and 1025 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1907
server-console/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

11
server-console/package.json
View file

@ -8,8 +8,8 @@
""
],
"devDependencies": {
"electron-packager": "^12.0.0",
"electron": "1.8.4"
"electron": "^3.0.0",
"electron-packager": "^12.1.2"
},
"repository": {
"type": "git",
@ -23,14 +23,15 @@
"packager": "node packager.js"
},
"dependencies": {
"always-tail": "0.2.0",
"cheerio": "^0.19.0",
"always-tail": "^0.2.0",
"cheerio": "^0.22.0",
"debug": "^4.0.1",
"electron-log": "1.1.1",
"extend": "^3.0.0",
"fs-extra": "^6.0.0",
"node-notifier": "^5.2.1",
"os-homedir": "^1.0.1",
"request": "^2.85.0",
"request": "^2.88.0",
"request-progress": "1.0.2",
"tar-fs": "^1.12.0",
"yargs": "^3.30.0"

13
server-console/src/main.js
View file

@ -247,15 +247,12 @@ process.on('uncaughtException', function(err) {
log.error(err.stack);
});
var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
// Someone tried to run a second instance, focus the window (if there is one)
return true;
});
const gotTheLock = app.requestSingleInstanceLock()
if (shouldQuit) {
log.warn("Another instance of the Sandbox is already running - this instance will quit.");
app.exit(0);
return;
if (!gotTheLock) {
log.warn("Another instance of the Sandbox is already running - this instance will quit.");
app.exit(0);
return;
}
// Check command line arguments to see how to find binaries