michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-04-27 02:11:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: add flag to force portable

Browse Source
This commit is contained in:
Koushik Dutta
2024-03-21 19:25:02 -07:00
parent 41a09629bf
commit 1c3bfc5acb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/plugin/runtime/python-worker.ts
View File

@@ -87,7 +87,6 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
}
let pythonPath = process.env.SCRYPTED_PYTHON_PATH;
const pluginPythonVersion: string = options.packageJson.scrypted.pythonVersion?.[os.platform()]?.[os.arch()] || options.packageJson.scrypted.pythonVersion?.default;
if (!pythonPath) {
if (os.platform() === 'win32') {
@@ -116,6 +115,10 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
this.worker.stderr.pipe(this.stderr);
};
let pluginPythonVersion: string = options.packageJson.scrypted.pythonVersion?.[os.platform()]?.[os.arch()] || options.packageJson.scrypted.pythonVersion?.default;
if (process.env.SCRYPTED_PORTABLE_PYTHON && !pluginPythonVersion)
pluginPythonVersion = packagedPythonVersion;
// if the plugin requests a specific python, then install it via portable python
if (!pluginPythonVersion) {
setup();
@@ -126,8 +129,8 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
}
const strippedPythonVersion = pluginPythonVersion.replace('.', '');
const envPython = process.env[`SCRYPTED_PYTHON${strippedPythonVersion}_PATH`];
if (fs.existsSync(envPython)) {
const envPython = !process.env.SCRYPTED_PORTABLE_PYTHON && process.env[`SCRYPTED_PYTHON${strippedPythonVersion}_PATH`];
if (envPython) {
pythonPath = envPython;
setup();
this.peerin = this.worker.stdio[3] as Writable;
@@ -173,7 +176,6 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
}
})();
}
}
setupRpcPeer(peer: RpcPeer): void {