From d66927f5fe32c1fc554bed691ad66dbbf07d37da Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sat, 2 Nov 2024 01:25:24 -0400 Subject: Bug fixes: * Remove PATH modification from check_pathvar * Rename check_pathvar to check_system_path * Add conda_prepend_bin function to handle PATH modification during activation * Add logic to handle first-run activation, and subsequent calls to change conda environments (otherwise conda clobbers its own shell functions) * Use $CONDA_PYTHON_EXE and $CONDA_EXE to ensure conda comes from the just-installed tree --- src/cli/stasis/system_requirements.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/cli/stasis/system_requirements.c') diff --git a/src/cli/stasis/system_requirements.c b/src/cli/stasis/system_requirements.c index 53ebbf7..d8d7df3 100644 --- a/src/cli/stasis/system_requirements.c +++ b/src/cli/stasis/system_requirements.c @@ -67,16 +67,11 @@ void check_requirements(struct Delivery *ctx) { check_system_env_requirements(); } -void check_pathvar(struct Delivery *ctx) { +void check_system_path() { char *pathvar = NULL; pathvar = getenv("PATH"); if (!pathvar) { msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "PATH variable is not set. Cannot continue.\n"); exit(1); - } else { - char pathvar_tmp[STASIS_BUFSIZ]; - sprintf(pathvar_tmp, "%s/bin:%s", ctx->storage.conda_install_prefix, pathvar); - setenv("PATH", pathvar_tmp, 1); - pathvar = NULL; } } \ No newline at end of file -- cgit