[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/process/mkzopeinstance.py make the template replacements more exactly match those used in the Zope 2

[Fred L. Drake, Jr.]

Log message for revision 24648:
make the template replacements more exactly match those used in the Zope 2
skeleton processing (to avoid spurious differences)



-=-
Modified: Zope3/trunk/src/zope/app/process/mkzopeinstance.py
===================================================================
--- Zope3/trunk/src/zope/app/process/mkzopeinstance.py	2004-05-14 13:22:58 UTC (rev 24647)
+++ Zope3/trunk/src/zope/app/process/mkzopeinstance.py	2004-05-14 13:41:59 UTC (rev 24648)
@@ -106,13 +106,15 @@
         options = self.options
         # XXX we should be able to compute the script
         script = os.path.abspath(sys.argv[0])
-        software_home = os.path.dirname(os.path.dirname(script))
+        zope_home = os.path.dirname(os.path.dirname(script))
+        software_home = os.path.join(zope_home, "lib", "python")
         self.replacements = [
-            ("@USERNAME@",     options.username),
-            ("@PASSWORD@",     options.password),
-            ("@PYTHON@",       sys.executable),
-            ("@INSTANCEHOME@", options.destination),
-            ("@SOFTWAREHOME@", software_home),
+            ("<<USERNAME>>",      options.username),
+            ("<<PASSWORD>>",      options.password),
+            ("<<PYTHON>>",        sys.executable),
+            ("<<INSTANCE_HOME>>", options.destination),
+            ("<<ZOPE_HOME>>",     zope_home),
+            ("<<SOFTWARE_HOME>>", software_home),
             ]
         self.copytree(self.options.skeleton, self.options.destination)