From f70ed27d93d1f8e982ba9a8b1e563299da6edf04 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Thu, 7 May 2020 17:10:40 -0500
Subject: [PATCH 1/2] Continue with warnings if conda not found. Fixes #1678

---
 bin/deepforge | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/deepforge b/bin/deepforge
index 9da6333ee..a3fc6c961 100755
--- a/bin/deepforge
+++ b/bin/deepforge
@@ -243,6 +243,15 @@ program.command('start')
     .option('-N, --no-conda', 'do not start deepforge server in a conda environment.')
     .option('-m, --mongo', 'start MongoDB')
     .action(async args => {
+        if(args.conda){
+            try {
+                Conda.check();
+            } catch (e) {
+                console.log('Warning: option to use a conda is selected but conda installation ' +
+                            `check failed with error: ${e}\nContinuing without using conda`);
+                args.conda = false;
+            }
+        }
         const serverCommand = getDeepForgeServerCommand(args.conda);
         const startAll = !args.server && !args.mongo;
         if (startAll) {

From 7f6c542f8cc6d153c0809ffd3e1341a526605013 Mon Sep 17 00:00:00 2001
From: Umesh Timalsina <umesh.timalsina@vanderbilt.edu>
Date: Tue, 21 Jul 2020 12:51:42 -0500
Subject: [PATCH 2/2] Fix warning message if conda not found

---
 bin/deepforge | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/deepforge b/bin/deepforge
index a3fc6c961..c21a0d8a1 100755
--- a/bin/deepforge
+++ b/bin/deepforge
@@ -247,8 +247,9 @@ program.command('start')
             try {
                 Conda.check();
             } catch (e) {
-                console.log('Warning: option to use a conda is selected but conda installation ' +
-                            `check failed with error: ${e}\nContinuing without using conda`);
+                console.log('Warning: conda executable not found. Please ' +
+                            'install conda for automatic management of Python ' +
+                            'dependencies via conda environments.');
                 args.conda = false;
             }
         }