From 35d0480f743abaa5c2c332f513043edd7c59081c Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 1 Nov 2024 00:55:19 -0400 Subject: Initialize structs to {0} and combine declaration and assignment where possible --- src/cli/stasis/stasis_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cli/stasis/stasis_main.c') diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c index 0c02796..cda5fa6 100644 --- a/src/cli/stasis/stasis_main.c +++ b/src/cli/stasis/stasis_main.c @@ -395,7 +395,7 @@ int main(int argc, char *argv[]) { } if (strlist_count(ctx.conda.pip_packages_defer)) { - if (!(ctx.conda.wheels_packages = delivery_build_wheels(&ctx))) { + if (!((ctx.conda.wheels_packages = delivery_build_wheels(&ctx)))) { exit(1); } if (delivery_index_wheel_artifacts(&ctx)) { -- cgit 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/stasis_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/cli/stasis/stasis_main.c') 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); -- cgit