[Zope-Checkins] CVS: Zope/inst/in - make_instance.py.in:1.1.2.12

Chris McDonough chrism@zope.com
Mon, 13 Jan 2003 12:15:24 -0500


Update of /cvs-repository/Zope/inst/in
In directory cvs.zope.org:/tmp/cvs-serv3443/inst/in

Modified Files:
      Tag: chrism-install-branch
	make_instance.py.in 
Log Message:
Renamed "zctl" to "zopectl" (as per TODO).


=== Zope/inst/in/make_instance.py.in 1.1.2.11 => 1.1.2.12 ===
--- Zope/inst/in/make_instance.py.in:1.1.2.11	Sun Jan  5 02:20:15 2003
+++ Zope/inst/in/make_instance.py.in	Mon Jan 13 12:14:53 2003
@@ -19,11 +19,13 @@
 import sha, binascii
 import install, file_from_infile
 
+controller = 'zopectl.py'
+
 def main(zopehome, insthome, skel_dir, in_dir, config_location, user, passwd):
     make_insthome(zopehome, insthome, skel_dir, in_dir, config_location)
     if not (user is None or passwd is None):
         write_inituser(insthome, user, passwd)
-    name = os.path.join(insthome, 'bin', 'zctl.py')
+    name = os.path.join(insthome, 'bin', controller)
     print 'Done!  Use "%s start" to start Zope.' % name
 
 def usage():
@@ -118,8 +120,8 @@
            'SOFTWARE_HOME':os.path.join(zopehome, 'lib', 'python'),
            'INSTANCE_HOME':insthome,
            }
-    file_from_infile.main(os.path.join(in_dir, 'zctl.py.in'),
-                          os.path.join(insthome, 'bin', 'zctl.py'), map, 0)
+    file_from_infile.main(os.path.join(in_dir, '%s.in' % controller),
+                          os.path.join(insthome, 'bin', controller), map, 0)
     file_from_infile.main(os.path.join(in_dir, 'zope.conf.in'),
                           os.path.join(insthome, 'etc', 'zope.conf'), map, 0)