diff options
Diffstat (limited to 'src/cli/stasis')
| -rw-r--r-- | src/cli/stasis/stasis_main.c | 5 | ||||
| -rw-r--r-- | src/cli/stasis/system_requirements.c | 7 | ||||
| -rw-r--r-- | src/cli/stasis/system_requirements.h | 2 | 
3 files changed, 5 insertions, 9 deletions
| diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c index 0c02796..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); @@ -395,7 +396,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)) { 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 diff --git a/src/cli/stasis/system_requirements.h b/src/cli/stasis/system_requirements.h index 3a6fa25..ddc2705 100644 --- a/src/cli/stasis/system_requirements.h +++ b/src/cli/stasis/system_requirements.h @@ -5,9 +5,9 @@  #include "callbacks.h"  #include "envctl.h" +void check_system_path();  void check_system_env_requirements();  void check_system_requirements(struct Delivery *ctx);  void check_requirements(struct Delivery *ctx); -void check_pathvar(struct Delivery *ctx);  #endif //STASIS_SYSTEM_REQUIREMENTS_H | 
