irkerd: Replace 'namestyle' global with local 'nick_template'

[irker.git] / irk

diff --git a/irk b/irk
index 4ca4a842d6defe19a957cdea18419ce861d2ccd9..954713dce81b87ae29cb7758cc5b595268458726 100755 (executable)
--- a/irk
+++ b/irk
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-# Illustrates how to test irkerd.  Requires that the irkerd source
-# be in the current directory.
+# Illustrates how to test irkerd.
 #
 # First argument must be a channel URL. If it does not begin with "irc", 
 # the base URL for freenode is prepended.
@@ -23,17 +22,12 @@ def send(target, message):
         s = socket.create_connection(("localhost", 6659))
         s.sendall(json.dumps(data))
     except socket.error, e:
-        sys.stderr.write("irkerd: write to server failed: %r\n" % e)
+        sys.stderr.write("irk: write to server failed: %r\n" % e)
 
-spawn = None
 try:
-    # irkerd might already be running
     s = socket.create_connection(("localhost", 6659))
 except:
-    # If it isn't, spawn an instance
-    print "Spawning an irker instance..."
-    subprocess.Popen("irkerd", shell=True)
-    time.sleep(0.5)
+    print "No irker is running."
 
 target = sys.argv[1]
 if not "irc:" in target: