X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mergefilecommand.cpp;h=643cf287bb9aded0847390aeea1091c12e95dd74;hb=1a968f34ae2d2680eaf189a197d1a21b8dfd6c03;hp=0501859e258f82410fa8360ae86092a0b1ea86f6;hpb=f687723a8357916e86a05116978e6869b039ce36;p=mothur.git

diff --git a/mergefilecommand.cpp b/mergefilecommand.cpp
index 0501859..643cf28 100644
--- a/mergefilecommand.cpp
+++ b/mergefilecommand.cpp
@@ -12,10 +12,10 @@
 //**********************************************************************************************************************
 vector<string> MergeFileCommand::setParameters(){	
 	try {
-		CommandParameter pinput("input", "String", "", "", "", "", "",false,true); parameters.push_back(pinput);
-		CommandParameter poutput("output", "String", "", "", "", "", "",false,true); parameters.push_back(poutput);
-		CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir);
-		CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir);
+		CommandParameter pinput("input", "String", "", "", "", "", "","",false,true,true); parameters.push_back(pinput);
+		CommandParameter poutput("output", "String", "", "", "", "", "","",false,true,true); parameters.push_back(poutput);
+		CommandParameter pinputdir("inputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(pinputdir);
+		CommandParameter poutputdir("outputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(poutputdir);
 		
 		vector<string> myArray;
 		for (int i = 0; i < parameters.size(); i++) {	myArray.push_back(parameters[i].name);		}
@@ -135,7 +135,7 @@ int MergeFileCommand::execute(){
 		if (m->control_pressed) {  m->mothurRemove(outputFileName); return 0;  }
 		
 		m->mothurOutEndLine();
-		m->mothurOut("Output File Name: "); m->mothurOutEndLine();
+		m->mothurOut("Output File Names: "); m->mothurOutEndLine();
 		m->mothurOut(outputFileName); m->mothurOutEndLine();	outputNames.push_back(outputFileName); outputTypes["merge"].push_back(outputFileName);
 		m->mothurOutEndLine();