X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.cpp;h=9ed0dfc5d1645c5c2b65cabdb04063e300634d04;hb=6d12ed0ba66fb35e9e2781fe3ca361e2293f2476;hp=ea3ea3e521cf6f00c48156df3a6c57e70ef97bda;hpb=202846c98b9eff0eca7b20a570bfffa8ee4a5f4e;p=mothur.git

diff --git a/mothur.cpp b/mothur.cpp
index ea3ea3e..9ed0dfc 100644
--- a/mothur.cpp
+++ b/mothur.cpp
@@ -35,8 +35,7 @@ void ctrlc_handler ( int sig ) {
 /***********************************************************************/
 int main(int argc, char *argv[]){
 	MothurOut* m = MothurOut::getInstance();
-	try {
-		
+	try {	
 		signal(SIGINT, ctrlc_handler );
 				
 		time_t ltime = time(NULL); /* calendar time */  
@@ -82,7 +81,7 @@ int main(int argc, char *argv[]){
 				if (lastChar != "\\") { temp += "\\"; }	
 			#endif
 			
-			temp = getFullPathName(temp);
+			temp = m->getFullPathName(temp);
 			m->setDefaultPath(temp);
 			
 			m->mothurOutJustToLog("Using default file location " + temp);
@@ -97,10 +96,16 @@ int main(int argc, char *argv[]){
 			m->mothurOutEndLine(); m->mothurOutEndLine();
 		#endif
 		
+		//get releaseDate from Make
+		string releaseDate = RELEASE_DATE; 
+		string mothurVersion = VERSION; 
+		m->setReleaseDate(releaseDate);
+		m->setVersion(mothurVersion);
+		
 		//header
-		m->mothurOut("mothur v.1.12.2");
+		m->mothurOut("mothur v." + mothurVersion);
 		m->mothurOutEndLine();		
-		m->mothurOut("Last updated: 7/30/2010");
+		m->mothurOut("Last updated: " + releaseDate);
 		m->mothurOutEndLine();	
 		m->mothurOutEndLine();		
 		m->mothurOut("by");
@@ -144,7 +149,7 @@ int main(int argc, char *argv[]){
 		Engine* mothur;
 		bool bail = 0;
 		string input;
-
+ 
 		if(argc>1){
 			input = argv[1];
 
@@ -186,11 +191,11 @@ int main(int argc, char *argv[]){
 
 			}else {
 				ofstream outNewLog;
-				openOutputFileAppend(newlogFileName, outNewLog);
+				m->openOutputFileAppend(newlogFileName, outNewLog);
 				outNewLog << endl << endl << "*********************************************************************************" << endl << endl;
 				outNewLog.close();
 				
-				appendFiles(logFileName, newlogFileName);
+				m->appendFiles(logFileName, newlogFileName);
 				remove(logFileName.c_str());
 			}
 		}else{