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

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	make_instance.py.in 
Log Message:
Move zope.py to SOFTWARE_HOME.

Make it possible to pass all directives on the command line to
zope.py as well as zctl.py.



=== Zope/inst/in/make_instance.py.in 1.1.2.5 => 1.1.2.6 ===
--- Zope/inst/in/make_instance.py.in:1.1.2.5	Sat Oct 12 16:28:34 2002
+++ Zope/inst/in/make_instance.py.in	Mon Oct 14 02:33:01 2002
@@ -20,7 +20,7 @@
 
 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 password is None):
+    if not (user is None or passwd is None):
         write_inituser(insthome, user, passwd)
     name = os.path.join(insthome, 'bin', 'zctl.py')
     print 'Done!  Use "%s start" to start Zope.' % name
@@ -152,7 +152,7 @@
     insthome = None
     user = None
     passwd = None
-    write_inituser = 1
+    do_inituser = 1
     config_location = None
     try:
         longopts = ["zopehome=", "insthome=", "inituser=", "help",
@@ -172,7 +172,7 @@
             insthome = os.path.abspath(os.path.expanduser(a))
         if o == '--inituser':
             if a == '':
-                write_inituser = 0
+                do_inituser = 0
                 continue
             tup=a.split(':', 1)
             msg = ('--inituser must be specified in the format'
@@ -201,7 +201,7 @@
         here = os.path.abspath(os.path.dirname(sys.argv[0]))
     else:
         here = os.path.abspath(os.path.dirname(__file__))
-    if write_inituser:
+    if do_inituser:
         if user is None or passwd is None:
             user, passwd = get_inituser(zopehome, insthome)
     # guess about skeleton and in directories.