aboutsummaryrefslogtreecommitdiff
path: root/src/cli/stasis/stasis_main.c
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-11-02 01:25:24 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-11-02 01:25:24 -0400
commitd66927f5fe32c1fc554bed691ad66dbbf07d37da (patch)
treeee8e31115d60fc1c666bba00803f990046157bca /src/cli/stasis/stasis_main.c
parent35d0480f743abaa5c2c332f513043edd7c59081c (diff)
downloadstasis-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/stasis_main.c')
-rw-r--r--src/cli/stasis/stasis_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c
index cda5fa6..e188b2e 100644
--- a/src/cli/stasis/stasis_main.c
+++ b/src/cli/stasis/stasis_main.c
@@ -133,6 +133,8 @@ int main(int argc, char *argv[]) {
printf(BANNER, VERSION, AUTHOR);
+ check_system_path();
+
msg(STASIS_MSG_L1, "Setup\n");
tpl_setup_vars(&ctx);
@@ -241,7 +243,6 @@ int main(int argc, char *argv[]) {
msg(STASIS_MSG_L2, "Installing: %s\n", ctx.conda.installer_name);
delivery_install_conda(ctx.conda.installer_path, ctx.storage.conda_install_prefix);
- check_pathvar(&ctx);
msg(STASIS_MSG_L2, "Configuring: %s\n", ctx.storage.conda_install_prefix);
delivery_conda_enable(&ctx, ctx.storage.conda_install_prefix);