X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getotuscommand.cpp;fp=getotuscommand.cpp;h=b075cb4bb61521c15e77c1a2e6966a6966daee4c;hb=c69e2e9749626cfbf1d6cb0125ae94f869e00b18;hp=fd7c8d1d4d7cc22901fc88d5b363176081fa5a14;hpb=c887ae6cd9f1c5b6e1b73a1384f154392be4efa3;p=mothur.git

diff --git a/getotuscommand.cpp b/getotuscommand.cpp
index fd7c8d1..b075cb4 100644
--- a/getotuscommand.cpp
+++ b/getotuscommand.cpp
@@ -27,8 +27,7 @@ vector<string> GetOtusCommand::getValidParameters(){
 //**********************************************************************************************************************
 GetOtusCommand::GetOtusCommand(){	
 	try {
-		abort = true;
-		//initialize outputTypes
+		abort = true; calledHelp = true; 
 		vector<string> tempOutNames;
 		outputTypes["group"] = tempOutNames;
 		outputTypes["list"] = tempOutNames;
@@ -64,10 +63,10 @@ vector<string> GetOtusCommand::getRequiredFiles(){
 //**********************************************************************************************************************
 GetOtusCommand::GetOtusCommand(string option)  {
 	try {
-		abort = false;
+		abort = false; calledHelp = false;   
 		
 		//allow user to run help
-		if(option == "help") { help(); abort = true; }
+		if(option == "help") { help(); abort = true; calledHelp = true; }
 		
 		else {
 			//valid paramters for this command
@@ -182,7 +181,7 @@ void GetOtusCommand::help(){
 int GetOtusCommand::execute(){
 	try {
 		
-		if (abort == true) { return 0; }
+		if (abort == true) { if (calledHelp) { return 0; }  return 2;	}
 		
 		groupMap = new GroupMap(groupfile);
 		groupMap->readMap();