From a61265effebd2bad454ae781d2b24dd236441353 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Wed, 11 Nov 2020 16:29:50 +0200
Subject: [PATCH] Improve trying to find conda executable

---
 trains_agent/helper/package/conda_api.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/trains_agent/helper/package/conda_api.py b/trains_agent/helper/package/conda_api.py
index 3b4a684..cb34389 100644
--- a/trains_agent/helper/package/conda_api.py
+++ b/trains_agent/helper/package/conda_api.py
@@ -92,8 +92,9 @@ class CondaAPI(PackageManager):
         )
         try:
             self.conda = (
-                find_executable("conda")
-                or Argv(select_for_platform(windows="where", linux="which"), "conda").get_output(shell=True).strip()
+                find_executable("conda") or
+                Argv(select_for_platform(windows="where", linux="which"), "conda").get_output(
+                    shell=select_for_platform(windows=True, linux=False)).strip()
             )
         except Exception:
             raise ValueError("ERROR: package manager \"conda\" selected, "