Merge branch 'master' of github.com:garabik/grc

grc

@@ -3,11 +3,11 @@
 import os, re, string, sys, getopt, signal
 
 def version():
-    print ("Generic Colouriser 1.9")
+    print ("Generic Colouriser 1.9.1rc1")
     sys.exit()
 
 def help():
-    print("""Generic Colouriser 1.9
+    print("""Generic Colouriser 1.9.1rc1
 grc [options] command [args]
 Options:")
 -e --stderr    redirect stderr. If this option is selected,

grc.conf

@@ -98,3 +98,6 @@ conf.docker-machinels
 (^|[/\w\.]+/)docker info\s?
 conf.dockerinfo
 
+# journalctl command
+(^|[/\w\.]+/)journalctl?\s
+conf.log

grcat

@@ -156,8 +156,9 @@ while not is_last:
         ll['colours'] = colstrings
 
     cs = ll['count']
-    ll['regexp'] = re.compile(ll['regexp']).search
-    regexplist.append(ll)
+    if ll.has_key('regexp'):
+        ll['regexp'] = re.compile(ll['regexp']).search
+        regexplist.append(ll)
 
 prevcolour = colours['default']
 prevcount = "more"