[Zope-Checkins] CVS: Zope/bin - mkzeoinstance:1.3

[Richard Jones]

Update of /cvs-repository/Zope/bin
In directory cvs.zope.org:/tmp/cvs-serv10780/bin

Modified Files:
	mkzeoinstance 
Log Message:
Make ZEO instances that actually work:
 - the scripts won't be in the user's $PATH, so override that lookup 
   in from mkzeoinst.py in the mkzeoinstance script
 - the scripts won't be executable, so prepend commands with $python


=== Zope/bin/mkzeoinstance 1.2 => 1.3 ===
--- Zope/bin/mkzeoinstance:1.2	Tue Mar 18 16:27:49 2003
+++ Zope/bin/mkzeoinstance	Thu Apr  3 02:11:03 2003
@@ -25,13 +25,17 @@
 from ZEO.mkzeoinst import ZEOInstanceBuilder
 
 class InstanceBuilder(ZEOInstanceBuilder):
-    def get_params(self, *args, **kw):
-        params = ZEOInstanceBuilder.get_params(self, *args, **kw)
-        sw = os.path.join(softwarehome, "lib", "python")
-        params["server"] = os.path.join(sw, "ZEO", "runzeo.py")
-        params["zdrun"] = os.path.join(sw, "zdaemon", "zdrun.py")
-        params["zdctl"] = os.path.join(sw, "zdaemon", "zdctl.py")
-        return params
+    def get_params(self, home, port):
+        return {
+            "package": "zeo",
+            "PACKAGE": "ZEO",
+            "home": home,
+            "port": port,
+            "python": sys.executable,
+            "server": os.path.join(softwarehome, "ZEO", "runzeo.py"),
+            "zdrun": os.path.join(softwarehome, "zdaemon", "zdrun.py"),
+            "zdctl": os.path.join(softwarehome, "zdaemon", "zdctl.py"),
+            }
 
 if __name__ == "__main__":
     InstanceBuilder().run()