From 02cee6f11f5ac3ff86686340f526b82fd97e6e95 Mon Sep 17 00:00:00 2001 From: 0neGal Date: Tue, 30 Apr 2024 21:38:21 +0200 Subject: fixed #231 (hopefully) Did an oopsie whoopsie doopsie, now its unoopsied --- src/modules/gamepath.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/gamepath.js b/src/modules/gamepath.js index 69cc446..5a5f922 100644 --- a/src/modules/gamepath.js +++ b/src/modules/gamepath.js @@ -153,7 +153,7 @@ gamepath.set = async (win, force_dialog) => { return gamepath.setting = false; } - await win().alert(lang("general.missing_path")); + await win.alert(lang("general.missing_path")); } // fallback to GUI/manual selection -- cgit v1.2.3 From 9b14fcb19784945ab0377ecaf731e53893260276 Mon Sep 17 00:00:00 2001 From: 0neGal Date: Tue, 30 Apr 2024 21:51:06 +0200 Subject: fixed game sometimes not shown as running on Linux This didn't happen in all cases, so it took me until randomly discovering it recently, for me to actually realize there was a problem, and then subsequently fixing it. --- src/modules/is_running.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/is_running.js b/src/modules/is_running.js index b9fbde1..9e45574 100644 --- a/src/modules/is_running.js +++ b/src/modules/is_running.js @@ -25,7 +25,7 @@ async function check_processes(processes) { // thing. And it's not much more clunky. let cmd = (() => { switch (process.platform) { - case "linux": return "ps a"; + case "linux": return "ps aux"; case "win32": return "tasklist"; } })(); -- cgit v1.2.3 From 7d9ee3a1276cf744d1a5ecd0e1bc53d61dc05935 Mon Sep 17 00:00:00 2001 From: 0neGal Date: Tue, 30 Apr 2024 21:54:01 +0200 Subject: fixed killing EA Desktop at times failing on Linux Pesky EA Desktop being annoying as always, leaving behind processes, to be fair, I don't exactly think you're supposed to be killing it it like this, but oh well, it seems to function now. --- src/modules/is_running.js | 4 +++- src/modules/kill.js | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/is_running.js b/src/modules/is_running.js index 9e45574..e2a2d96 100644 --- a/src/modules/is_running.js +++ b/src/modules/is_running.js @@ -53,7 +53,9 @@ is_running.game = () => { is_running.origin = () => { return check_processes([ "Origin.exe", - "EADesktop.exe" + "EADesktop.exe", + "CrBrowserMain", + "EABackgroundSer" ]) } diff --git a/src/modules/kill.js b/src/modules/kill.js index 43eda23..5d03218 100644 --- a/src/modules/kill.js +++ b/src/modules/kill.js @@ -33,6 +33,12 @@ kill.origin = async () => { let origin = await kill("Origin.exe"); let eadesktop = await kill("EADesktop.exe"); + // these should be Linux only, and the above shouldn't succeed if + // these don't succeed, so we shouldn't have to check whether these + // actually succeeded or not + await kill("CrBrowserMain"); + await kill("EABackgroundSer"); + if (origin || eadesktop) { return true; } -- cgit v1.2.3 From 271d6e86e91b3e91765152154439cc33627e1e06 Mon Sep 17 00:00:00 2001 From: 0neGal Date: Wed, 1 May 2024 01:57:59 +0200 Subject: bumped version number to 1.11.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 341e73c..52f4f86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "viper", - "version": "1.11.0", + "version": "1.11.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "viper", - "version": "1.11.0", + "version": "1.11.1", "license": "GPL-3.0-or-later", "dependencies": { "electron-updater": "^4.6.1", diff --git a/package.json b/package.json index 4c73915..9a7ea79 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "viper", "productName": "Viper", - "version": "1.11.0", + "version": "1.11.1", "description": "Launcher+Updater for TF|2 Northstar", "main": "src/index.js", "build": { -- cgit v1.2.3 From 17f543f679b47c296afdeb682e0952b71e878882 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 12:25:15 +0000 Subject: Bump ejs from 3.1.9 to 3.1.10 Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](https://github.com/mde/ejs/compare/v3.1.9...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52f4f86..17cd704 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1546,9 +1546,9 @@ "dev": true }, "node_modules/ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, "dependencies": { "jake": "^10.8.5" @@ -4936,9 +4936,9 @@ "dev": true }, "ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, "requires": { "jake": "^10.8.5" -- cgit v1.2.3