X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quitcommand.cpp;h=2c302e9e6b4f195c7d4acb1df97fd6110ea02ad5;hb=1a968f34ae2d2680eaf189a197d1a21b8dfd6c03;hp=05e2758a2778505858283a450dbfb0b270cf77ca;hpb=315e38cf393c82be238da5b32574f225a020d25c;p=mothur.git

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