diff --git a/src/main/util.ts b/src/main/util.ts index 5e2e5d5d39e5d9c5d1c0b636179defee0f852820..6101360453b8d0eea43e6cb38a75f0f5e59fa5e4 100644 --- a/src/main/util.ts +++ b/src/main/util.ts @@ -140,7 +140,7 @@ export function checkIfShellCommandExists(command: string) { export function checkIfCondaBinExists() { // Look for the file ~/miniconda3/bin/conda - const condaBin = path.join(homeDir, 'miniconda3/bin/conda'); + const condaBin = path.join(homeDir, '.transformerlab/miniconda3/bin/conda'); if (fs.existsSync(condaBin)) { return true; } else { @@ -160,14 +160,14 @@ export async function checkDependencies() { console.log('Error running pip list', err); return { stdout: false, - stderr: err + stderr: err, }; }); - // if there was an error abort processing + // if there was an error abort processing if (!stdout) { if (stderr) console.error('stderr:', stderr); - return ["Failed to detect packages"]; + return ['Failed to detect packages']; } console.log('stdout:', stdout); @@ -205,14 +205,17 @@ export async function checkIfCondaEnvironmentExists() { const { stdout, stderr } = await awaitExec(command, options).catch((err) => { return { stdout: false, - stderr: err + stderr: err, }; }); if (stdout) console.log('stdout:', stdout); if (stderr) console.error('stderr:', stderr); // search for the string "transformerlab" in the output - if (stdout && stdout.includes('transformerlab')) { + if ( + stdout && + stdout.includes(path.join(homeDir, '.transformerlab/envs/transformerlab')) + ) { return true; } else { return false; @@ -240,7 +243,7 @@ export async function executeInstallStep( console.log('Error running install.sh', err); return { stdout: false, - stderr: err + stderr: err, }; }); if (stdout) console.log('stdout:', stdout); @@ -253,7 +256,7 @@ export async function executeInstallStep( console.log('Error running install.sh', err); return { stdout: false, - stderr: err + stderr: err, }; }); if (stdout) console.log('stdout:', stdout); diff --git a/src/renderer/components/Connect/LocalConnection.tsx b/src/renderer/components/Connect/LocalConnection.tsx index c6ab9eaaa66469b216535ea34880af2faac1d419..3b58d36df0b0ebab79450bab59ac3084fb194487 100644 --- a/src/renderer/components/Connect/LocalConnection.tsx +++ b/src/renderer/components/Connect/LocalConnection.tsx @@ -745,7 +745,7 @@ function InstallStepper({ setServer }) { </InstallStep> <InstallStep thisStep={Steps.indexOf('CHECK_IF_CONDA_INSTALLED')} - title="Check if Conda is Installed at ~/miniconda3/" + title="Check if Conda is Installed at ~/.transformerlab/miniconda3/" activeStep={activeStep} setActiveStep={setActiveStep} >