fixes #56: corrected custom intro to print nicely

ghantoos · Aug 14, 2013 · 1dbe8c3 · 1dbe8c3
1 parent 35ae2b0
commit 1dbe8c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lshell/checkconfig.py b/lshell/checkconfig.py
@@ -589,7 +589,10 @@ def get_config_user(self):
                 self.log.error('CONF: scpforce must be a string!')
 
         if self.conf_raw.has_key('intro'):
-            self.conf['intro'] = self.conf_raw['intro']
+            try:
+                self.conf['intro'] = eval(self.conf_raw['intro'])
+            except:
+                self.conf['intro'] = intro
         else:
             self.conf['intro'] = intro
 

diff --git a/lshell/shellcmd.py b/lshell/shellcmd.py
@@ -528,8 +528,8 @@ def cmdloop(self, intro=None):
             readline.set_completer(self.complete)
             readline.parse_and_bind(self.completekey+": complete")
         try:
-            if self.conf['intro']:
-                self.stdout.write(str(self.conf['intro'])+"\n")
+            if self.intro and isinstance(self.intro, str):
+                self.stdout.write("%s\n" % self.intro)
             if self.conf['login_script']:
                 os.system(self.conf['login_script'])
             stop = None