From 73fc738c0bde7e09ac8b04e8de0648cc2f724c8a Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 3 Sep 2023 17:45:55 -0700 Subject: [PATCH] cloud: additional bin path fixes --- plugins/cloud/.vscode/settings.json | 2 +- plugins/cloud/package-lock.json | 4 ++-- plugins/cloud/package.json | 2 +- plugins/cloud/src/main.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/cloud/.vscode/settings.json b/plugins/cloud/.vscode/settings.json index 77ccdbd6d..44d4d203f 100644 --- a/plugins/cloud/.vscode/settings.json +++ b/plugins/cloud/.vscode/settings.json @@ -1,4 +1,4 @@ { - "scrypted.debugHost": "127.0.0.1", + "scrypted.debugHost": "koushik-ubuntu", } \ No newline at end of file diff --git a/plugins/cloud/package-lock.json b/plugins/cloud/package-lock.json index a7aa3d4d3..c87ba6962 100644 --- a/plugins/cloud/package-lock.json +++ b/plugins/cloud/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/cloud", - "version": "0.1.37", + "version": "0.1.38", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/cloud", - "version": "0.1.37", + "version": "0.1.38", "dependencies": { "@eneris/push-receiver": "^3.1.4", "@scrypted/common": "file:../../common", diff --git a/plugins/cloud/package.json b/plugins/cloud/package.json index 68b3356b2..baf052894 100644 --- a/plugins/cloud/package.json +++ b/plugins/cloud/package.json @@ -54,5 +54,5 @@ "@types/nat-upnp": "^1.1.2", "@types/node": "^20.4.5" }, - "version": "0.1.37" + "version": "0.1.38" } diff --git a/plugins/cloud/src/main.ts b/plugins/cloud/src/main.ts index 9a9331492..22c0ac512 100644 --- a/plugins/cloud/src/main.ts +++ b/plugins/cloud/src/main.ts @@ -800,8 +800,9 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings, const pluginVolume = process.env.SCRYPTED_PLUGIN_VOLUME; const version = 2; const cloudflareD = path.join(pluginVolume, 'cloudflare.d', `v${version}`, `${process.platform}-${process.arch}`); + const bin = path.join(cloudflareD, cloudflared.bin); - if (!fs.existsSync(cloudflared.bin)) { + if (!fs.existsSync(bin)) { for (let i = 0; i <= version; i++) { const cloudflareD = path.join(pluginVolume, 'cloudflare.d', `v${version}`); rmSync(cloudflareD, { @@ -809,7 +810,6 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings, recursive: true, }); } - const bin = path.join(cloudflareD, cloudflared.bin); if (process.platform === 'darwin' && process.arch === 'arm64') { const bin = path.join(cloudflareD, cloudflared.bin); mkdirSync(path.dirname(bin), {