X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=quitcommand.cpp;h=2c302e9e6b4f195c7d4acb1df97fd6110ea02ad5;hp=8e6fd15412167f9b2ae26eec7b9d93a8e19c6bd2;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0

diff --git a/quitcommand.cpp b/quitcommand.cpp
index 8e6fd15..2c302e9 100644
--- a/quitcommand.cpp
+++ b/quitcommand.cpp
@@ -10,36 +10,19 @@
 #include "quitcommand.h"
 
 //**********************************************************************************************************************
-
 QuitCommand::QuitCommand(string option) {
-		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 if(option == "citation") { citation(); abort = true; calledHelp = true;}
 
 }
 //**********************************************************************************************************************
-
-void QuitCommand::help(){
-	try {
-		 m->mothurOut("The quit command will terminate mothur and should be in the following format: \n"); 
-		 m->mothurOut("quit() or quit\n\n");
-	}
-	catch(exception& e) {
-		m->errorOut(e, "QuitCommand", "help");
-		exit(1);
-	}
-}
-
-//**********************************************************************************************************************
-
 QuitCommand::~QuitCommand(){}
-
 //**********************************************************************************************************************
-
 int QuitCommand::execute(){
 	if (abort == true) { return 0; }
 	return 1;
 }
-
 //**********************************************************************************************************************