X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=systemcommand.cpp;h=c07deff1f19c0315b29e0f488572b3feacb7114f;hb=791f42d21a85f794529fd4c912dcc27d873c25e8;hp=d0057e8b4e8c199f9113f54af6a46836ab6f58b4;hpb=19fcbbdba99658f5eca244803280f9ee7f9f6607;p=mothur.git diff --git a/systemcommand.cpp b/systemcommand.cpp index d0057e8..c07deff 100644 --- a/systemcommand.cpp +++ b/systemcommand.cpp @@ -91,23 +91,31 @@ int SystemCommand::execute(){ if (abort == true) { if (calledHelp) { return 0; } return 2; } - command += " > ./commandScreen.output 2>&1"; - system(command.c_str()); + //if command contains a redirect don't add the redirect + bool usedRedirect = false; + if ((command.find('>')) == string::npos) { + command += " > ./commandScreen.output 2>&1"; + usedRedirect = true; + } - ifstream in; - string filename = "./commandScreen.output"; - m->openInputFile(filename, in, "no error"); + system(command.c_str()); - string output = ""; - while(char c = in.get()){ - if(in.eof()) { break; } - else { output += c; } + if (usedRedirect) { + ifstream in; + string filename = "./commandScreen.output"; + m->openInputFile(filename, in, "no error"); + + string output = ""; + while(char c = in.get()){ + if(in.eof()) { break; } + else { output += c; } + } + in.close(); + + m->mothurOut(output); m->mothurOutEndLine(); + m->mothurRemove(filename); } - in.close(); - m->mothurOut(output); m->mothurOutEndLine(); - m->mothurRemove(filename); - return 0; }