Adds vsearch for Windows to cluster

mothur · c893d7b57d1383676633017376afc4d171ffe8a4 · mothur-westcott committed Dec 13, 2016 · Dec 13, 2016 · c893d7b
1 parent 933adb1
commit c893d7b57d1383676633017376afc4d171ffe8a4
Unified Split

Showing with 4 additions and 2 deletions.

+4 −2 source/commands/clustercommand.cpp
diff --git a/source/commands/clustercommand.cpp b/source/commands/clustercommand.cpp
@@ -402,14 +402,16 @@ int ClusterCommand::runVsearchCluster(){
             m->mothurOut(vsearchCommand + " file does not exist. Checking path... \n");
             //check to see if uchime is in the path??
             
-            string uLocation = m->findProgramPath("vsearch");
+            string uLocation = "";m->findProgramPath("vsearch");
             
             
             ifstream in2;
 #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
+            uLocation = m->findProgramPath("vsearch");
             ableToOpen = m->openInputFile(uLocation, in2, "no error"); in2.close();
 #else
-            ableToOpen = m->openInputFile((uLocation + ".exe"), in2, "no error"); in2.close();
+            uLocation = m->findProgramPath("vsearch.exe");
+            ableToOpen = m->openInputFile((uLocation), in2, "no error"); in2.close();
 #endif
             
             if(ableToOpen == 1) { m->mothurOut("[ERROR]: " + uLocation + " file does not exist. mothur requires the vsearch executable."); m->mothurOutEndLine(); m->control_pressed = true; }