diff --git a/packages/cli/.vscode/launch.json b/packages/cli/.vscode/launch.json index 18a8b5bf3a..476cea655d 100644 --- a/packages/cli/.vscode/launch.json +++ b/packages/cli/.vscode/launch.json @@ -21,8 +21,7 @@ ], "preLaunchTask": "npm: build", "args": [ - "rtsp", - "/Volumes/Seagate/video/scrypted-1370/1720470474217/1720470474217/1720470474217.rtsp", + "serve", ], "sourceMaps": true, "resolveSourceMapLocations": [ diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json index ffe13b9d26..70142d00bd 100644 --- a/packages/cli/package-lock.json +++ b/packages/cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "scrypted", - "version": "1.3.19", + "version": "1.3.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "scrypted", - "version": "1.3.19", + "version": "1.3.20", "license": "ISC", "dependencies": { "@scrypted/client": "^1.3.3", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6418f8bb07..dcf6cb9f18 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "scrypted", - "version": "1.3.19", + "version": "1.3.20", "description": "", "main": "./dist/packages/cli/src/main.js", "bin": { diff --git a/packages/cli/src/service.ts b/packages/cli/src/service.ts index d302b8dc7c..4b554263a3 100644 --- a/packages/cli/src/service.ts +++ b/packages/cli/src/service.ts @@ -12,6 +12,7 @@ async function sleep(ms: number) { const EXIT_FILE = '.exit'; const UPDATE_FILE = '.update'; +const VERSION_FILE = '.version'; async function runCommand(command: string, ...args: string[]) { if (os.platform() === 'win32') { @@ -117,6 +118,15 @@ export async function installServe(installVersion: string, ignoreError?: boolean } export async function serveMain(installVersion?: string) { + const { installDir, volume } = cwdInstallDir(); + if (!installVersion) { + try { + installVersion = fs.readFileSync(path.join(volume, VERSION_FILE)).toString().trim(); + } + catch (e) { + } + } + const options = ((): { install: true; version: string } | { install: false } => { if (installVersion) { console.log(`Installing @scrypted/server@${installVersion}`); @@ -139,7 +149,6 @@ export async function serveMain(installVersion?: string) { } })(); - const { installDir, volume } = cwdInstallDir(); if (options.install) { await installServe(options.version, true);