diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-11-02 01:25:24 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-11-02 01:25:24 -0400 |
| commit | d66927f5fe32c1fc554bed691ad66dbbf07d37da (patch) | |
| tree | ee8e31115d60fc1c666bba00803f990046157bca /src/cli/stasis/system_requirements.c | |
| parent | 35d0480f743abaa5c2c332f513043edd7c59081c (diff) | |
| download | stasis-d66927f5fe32c1fc554bed691ad66dbbf07d37da.tar.gz | |
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
Diffstat (limited to 'src/cli/stasis/system_requirements.c')
| -rw-r--r-- | src/cli/stasis/system_requirements.c | 7 |
1 files changed, 1 insertions, 6 deletions
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 |