From 02d7340e1e095e46cda5f97f800f5433996f3033 Mon Sep 17 00:00:00 2001
From: Izumi Hoshino <admin@chiamine.jp>
Date: Fri, 22 Mar 2024 22:27:58 +0900
Subject: [PATCH] `python .../venv/bin/chia` -> `.../venv/bin/chia`
---
packages/gui/src/util/chiaEnvironment.js | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/packages/gui/src/util/chiaEnvironment.js b/packages/gui/src/util/chiaEnvironment.js
index 22531e958c..b1cb6678cc 100644
--- a/packages/gui/src/util/chiaEnvironment.js
+++ b/packages/gui/src/util/chiaEnvironment.js
@@ -12,7 +12,7 @@ const PY_DIST_EXECUTABLE = 'chia';
const PY_DIST_EXEC_ARGS = Object.freeze(['start', 'daemon']);
const PY_DEV_EXECUTABLE = `../../../venv/${process.platform === 'win32' ? 'Scripts/chia.exe' : 'bin/chia'}`;
-const PY_DEV_EXEC_ARGS = Object.freeze([PY_DEV_EXECUTABLE, 'start', 'daemon']);
+const PY_DEV_EXEC_ARGS = Object.freeze(['start', 'daemon']);
let pyProc = null;
let haveCert = null;
@@ -68,20 +68,26 @@ const startChiaDaemon = () => {
if (guessPackaged()) {
const executablePath = getExecutablePath(PY_DIST_EXECUTABLE);
console.info('Running python executable: ');
+ console.info(`Script: ${executablePath} ${PY_DIST_EXEC_ARGS.join(' ')}`);
try {
const Process = childProcess.spawn;
pyProc = new Process(executablePath, PY_DIST_EXEC_ARGS);
} catch (e) {
- console.info('Running python executable: Error: ');
- console.info(`Script: ${executablePath} ${PY_DIST_EXEC_ARGS.join(' ')}`);
+ console.error('Running python executable: Error: ');
+ console.error(e);
}
} else {
console.info('Running python script');
- console.info(`Script: python ${PY_DEV_EXEC_ARGS.join(' ')}`);
+ console.info(`Script: ${PY_DEV_EXECUTABLE} ${PY_DEV_EXEC_ARGS.join(' ')}`);
- const Process = childProcess.spawn;
- pyProc = new Process('python', PY_DEV_EXEC_ARGS);
+ try {
+ const Process = childProcess.spawn;
+ pyProc = new Process(PY_DEV_EXECUTABLE, PY_DEV_EXEC_ARGS);
+ } catch (e) {
+ console.error('Running python script: Error: ');
+ console.error(e);
+ }
}
if (!pyProc) {