X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=helpcommand.cpp;h=47d04f9d528ab14053f468f2eacc7e150db736c0;hp=e0ef2a3ebdf20de0d8a7e3ede3ad4a5f14857da1;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=a5afca18544555fba2d9c3670ad1f8574916b0a0

diff --git a/helpcommand.cpp b/helpcommand.cpp
index e0ef2a3..47d04f9 100644
--- a/helpcommand.cpp
+++ b/helpcommand.cpp
@@ -11,27 +11,22 @@
 
 //**********************************************************************************************************************
 
-HelpCommand::HelpCommand(string option){
-
-	
-	if (option != "") { mothurOut("There are no valid parameters for the help() command."); mothurOutEndLine();  }
-	
-	validCommands = CommandFactory::getInstance();
+HelpCommand::HelpCommand(string option)  {	
+	validCommands = CommandFactory::getInstance();	
 }
-
 //**********************************************************************************************************************
-
-HelpCommand::~HelpCommand(){}
-
-//**********************************************************************************************************************
-
 int HelpCommand::execute(){
-
-	validCommands->printCommands(cout);
-	mothurOut("For more information about a specific command type 'commandName(help)' i.e. 'read.dist(help)'"); mothurOutEndLine();
+	try {
+		validCommands->printCommands(cout);
+		m->mothurOut("For more information about a specific command type 'commandName(help)' i.e. 'read.dist(help)'"); m->mothurOutEndLine();
 	
-	mothurOutEndLine(); mothurOut("For further assistance please refer to the Mothur manual on our wiki at http://www.mothur.org/wiki, or contact Pat Schloss at mothur.bugs@gmail.com.\n");
-	return 0;
+		m->mothurOutEndLine(); m->mothurOut("For further assistance please refer to the Mothur manual on our wiki at http://www.mothur.org/wiki, or contact Pat Schloss at mothur.bugs@gmail.com.\n");
+	
+		return 0;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "HelpCommand", "execute");
+		exit(1);
+	}
 }
-
 //**********************************************************************************************************************/