[Zodb-checkins] SVN: ZODB/trunk/src/scripts/mkzeoinst.py Merge rev 37886 from 3.4 branch.

[Tim Peters]

Log message for revision 37900:
  Merge rev 37886 from 3.4 branch.
  
  [Martijn Pieters]
  Include INSTANCE_HOME in the runzeo and zeoctl startup scripts from
  the get-go; this helps poor schmucks like me who have to make
  app-level conflict resolution work in Products as well. Including
  INSTANCE_HOME makes sure ZEO can find the product code in the first
  place.
  

Changed:
  U   ZODB/trunk/src/scripts/mkzeoinst.py

-=-
Modified: ZODB/trunk/src/scripts/mkzeoinst.py
===================================================================
--- ZODB/trunk/src/scripts/mkzeoinst.py	2005-08-12 20:25:44 UTC (rev 37899)
+++ ZODB/trunk/src/scripts/mkzeoinst.py	2005-08-12 21:47:52 UTC (rev 37900)
@@ -95,12 +95,13 @@
 # description: start a %(PACKAGE)s server
 
 PYTHON="%(python)s"
+INSTANCE_HOME="%(instance_home)s"
 ZODB3_HOME="%(zodb3_home)s"
 
 CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
 
 PYTHONPATH="$ZODB3_HOME"
-export PYTHONPATH
+export PYTHONPATH INSTANCE_HOME
 
 ZEOCTL="$ZODB3_HOME/ZEO/zeoctl.py"
 
@@ -112,12 +113,13 @@
 # %(PACKAGE)s instance start script
 
 PYTHON="%(python)s"
+INSTANCE_HOME="%(instance_home)s"
 ZODB3_HOME="%(zodb3_home)s"
 
 CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
 
 PYTHONPATH="$ZODB3_HOME"
-export PYTHONPATH
+export PYTHONPATH INSTANCE_HOME
 
 RUNZEO="$ZODB3_HOME/ZEO/runzeo.py"