Changeset 2557 for trunk/MagicSoft/Mars/macros

Timestamp:

11/22/03 21:14:14 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/rootlogon.C (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/rootlogon.C

@@ -42 +42 @@
 }
 
-void load(TString &dir)
+bool load(TString &dir)
 {
     if (isloaded())
         return;
 
-    cout << "Loading 'libmars.so'... " << flush;
+    cout << "\033[33m\033[1m" << "Loading '" << dir << "libmars.so'... " << "\033[31m" << flush;
 
-    if (gSystem->Load(dir.IsNull() ? "libmars.so" : dir+"libmars.so")!=0)
-        cout << "error." << endl;
+    if (dir.IsNull())
+        dir = "./";
+
+    if (gSystem->Load(dir+"libmars.so")!=0)
+    {
+        cout << "\033[33m\033[1m" << "error." << endl;
+        cout << "\033[0m" << endl;
+        return false;
+    }
     else
     {
         MParContainer::Class()->IgnoreTObjectStreamer();
         MArray::Class()->IgnoreTObjectStreamer();
-        cout << "done." << endl;
+        cout << "\033[33m\033[1m" << "done." << endl;
+        cout << "\033[0m" << endl;
+        return true;
     }
-
-    cout << endl;
 }
 /*
@@ -79 +86 @@
 
     TString dir = gSystem->Getenv("MARSSYS");
-
     if (!dir.IsNull())
     {
-        cout << "Mars found in " << dir << " (MARSSYS)" << endl << endl;
+        cout << "\033[34m\033[1m" << "Searching Mars in " << dir << " (MARSSYS)" << "\033[0m" << endl << endl;
 
         if (!dir.EndsWith("/"))
@@ -88 +94 @@
     }
 
-    load(dir);
+    if (!load(dir))
+        return;
 
     gInterpreter->AddIncludePath(dir+"macros");
@@ -119 +126 @@
     }
 
-    cout << "Welcome to the Mars Root environment." << endl;
-
+    cout << "\033[32m" << "Welcome to the Mars Root environment." << "\033[0m" << endl;
     cout << endl;
 }