mirror of
https://github.com/Zagrios/bs-manager.git
synced 2026-07-03 14:08:25 +02:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2427865cf0 | |||
| a118ec2013 |
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
"name": "bs-manager",
|
"name": "bs-manager",
|
||||||
"description": "Manage maps, mods and more for Beat Saber",
|
"description": "Manage maps, mods and more for Beat Saber",
|
||||||
"main": "./.erb/dll/main.bundle.dev.js",
|
"main": "./.erb/dll/main.bundle.dev.js",
|
||||||
"version": "1.5.5",
|
"version": "1.5.6",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build-rust-scripts": "tsx ./.erb/scripts/build-rust-scripts.js",
|
"build-rust-scripts": "tsx ./.erb/scripts/build-rust-scripts.js",
|
||||||
"build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
|
"build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "bs-manager",
|
"name": "bs-manager",
|
||||||
"version": "1.5.5",
|
"version": "1.5.6",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "bs-manager",
|
"name": "bs-manager",
|
||||||
"version": "1.5.5",
|
"version": "1.5.6",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "bs-manager",
|
"name": "bs-manager",
|
||||||
"version": "1.5.5",
|
"version": "1.5.6",
|
||||||
"description": "BSManager",
|
"description": "BSManager",
|
||||||
"main": "./dist/main/main.js",
|
"main": "./dist/main/main.js",
|
||||||
"author": {
|
"author": {
|
||||||
|
|||||||
@@ -48,7 +48,9 @@ export class OculusLauncherService extends AbstractLauncherService implements St
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Make sure Oculus is running
|
// Make sure Oculus is running
|
||||||
await this.oculus.startOculus().catch(err => log.error("Error while starting Oculus", err));
|
await this.oculus.startOculus().catch(err => log.error("Error while starting Oculus", err)).catch(err => {
|
||||||
|
log.warn("Unable to start Oculus client. Force launch.", err);
|
||||||
|
});
|
||||||
|
|
||||||
let env: Record<string, string> = {
|
let env: Record<string, string> = {
|
||||||
...process.env,
|
...process.env,
|
||||||
@@ -57,7 +59,7 @@ export class OculusLauncherService extends AbstractLauncherService implements St
|
|||||||
env: parsedEnv,
|
env: parsedEnv,
|
||||||
cmdlet, args,
|
cmdlet, args,
|
||||||
} = parseLaunchOptions(launchOptions.command, {
|
} = parseLaunchOptions(launchOptions.command, {
|
||||||
commandReplacement: exePath,
|
commandReplacement: `"${exePath}"`,
|
||||||
});
|
});
|
||||||
env = this.mergeEnvVariables(env, parsedEnv);
|
env = this.mergeEnvVariables(env, parsedEnv);
|
||||||
|
|
||||||
|
|||||||
@@ -105,8 +105,12 @@ export class OculusService {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public oculusRunning(): Promise<boolean> {
|
public async oculusRunning(): Promise<boolean> {
|
||||||
return isProcessRunning("OculusClient");
|
if (await isProcessRunning("OculusClient")) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isProcessRunning("Client"); // new name of oculus client
|
||||||
}
|
}
|
||||||
|
|
||||||
public async startOculus(): Promise<void>{
|
public async startOculus(): Promise<void>{
|
||||||
|
|||||||
Reference in New Issue
Block a user