X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2Favahi-publish-service.in;h=de259574f0eedbe2a66d4e9e19eeff8c54811d91;hb=f3164a7664414f7640b3f163bcaf9c2e87578bdb;hp=dfb21ab121de323698cabde9a79fa63b957f805c;hpb=ccdf8185dee9e480b2974d7a6387b12d5b6699cf;p=catta

diff --git a/avahi-utils/avahi-publish-service.in b/avahi-utils/avahi-publish-service.in
index dfb21ab..de25957 100755
--- a/avahi-utils/avahi-publish-service.in
+++ b/avahi-utils/avahi-publish-service.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$
 
@@ -36,7 +36,7 @@ def usage(retval = 0):
 try:
     opts, args = getopt.getopt(sys.argv[1:], "d:H:", ["help", "domain=", "host="])
 except getopt.GetoptError:
-    usage(2)
+    pass
 
 domain = ""
 host = ""
@@ -52,8 +52,7 @@ for o, a in opts:
         host = a
 
 if len(args) < 3:
-    sys.stderr.write("Invalid number of arguments\n")
-    sys.exit(1)
+    usage(2)
 
 name = args[0]
 stype = args[1]
@@ -70,16 +69,18 @@ n_rename = 0
 def remove_service():
     global group
 
-    if not (group is None):
-        group.Free()
-        group = None
+    if not group is None:
+        group.Reset()
 
 def add_service():
     global server, group, name, stype, domain, host, port, txt
-    assert group is None
+
+    if group is None:
+        group = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.EntryGroupNew()), avahi.DBUS_INTERFACE_ENTRY_GROUP)
+
+    assert group.IsEmpty()
 
     print "Adding service '%s' of type '%s' ..." % (name, stype)
-    group = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.EntryGroupNew()), avahi.DBUS_INTERFACE_ENTRY_GROUP)
     group.connect_to_signal('StateChanged', entry_group_state_changed)
     group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, name, stype, domain, host, dbus.UInt16(port), txt)
     group.Commit()
@@ -120,4 +121,5 @@ try:
 except KeyboardInterrupt, k:
     pass
 
-remove_service()
+if not group is None:
+    group.Free()