X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.cpp;h=c413cedeef8dac80a552349a48129dfb54d50a1d;hb=9013e13ecfb2fda3c2664a76f76cc99b8c7fa74c;hp=d674ff40470a6f485153d8ee90044ae878dfc427;hpb=8130a55348ef2b5f431fe47c6a83aae581e244b5;p=mothur.git diff --git a/mothur.cpp b/mothur.cpp index d674ff4..c413ced 100644 --- a/mothur.cpp +++ b/mothur.cpp @@ -12,7 +12,6 @@ #include "globaldata.hpp" #include "mothurout.h" - /**************************************************************************************************/ GlobalData* GlobalData::_uniqueInstance = 0; @@ -72,10 +71,36 @@ int main(int argc, char *argv[]){ m->mothurOutEndLine(); m->mothurOutEndLine(); #endif + #ifdef MOTHUR_FILES + string temp = MOTHUR_FILES; + + //add / to name if needed + string lastChar = temp.substr(temp.length()-1); + #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) + if (lastChar != "/") { temp += "/"; } + #else + if (lastChar != "\\") { temp += "\\"; } + #endif + + temp = getFullPathName(temp); + m->setDefaultPath(temp); + + m->mothurOutJustToLog("Using default file location " + temp); + m->mothurOutEndLine(); m->mothurOutEndLine(); + #endif + + #ifdef BIT_VERSION + m->mothurOutJustToLog("Running 64Bit Version"); + m->mothurOutEndLine(); m->mothurOutEndLine(); + #else + m->mothurOutJustToLog("Running 32Bit Version"); + m->mothurOutEndLine(); m->mothurOutEndLine(); + #endif + //header - m->mothurOut("mothur v.1.9"); + m->mothurOut("mothur v.1.12.1"); m->mothurOutEndLine(); - m->mothurOut("Last updated: 4/16/2010"); + m->mothurOut("Last updated: 7/29/2010"); m->mothurOutEndLine(); m->mothurOutEndLine(); m->mothurOut("by");