[Zope-Checkins] CVS: Zope/skel/bin - runzope.bat.in:1.3 runzope.in:1.6 zopectl.in:1.6

[Chris McDonough]

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

Modified Files:
	runzope.bat.in runzope.in zopectl.in 
Log Message:
Take advantage of SOFTWARE_HOME expansion from mkzopeinstance.



=== Zope/skel/bin/runzope.bat.in 1.2 => 1.3 ===
--- Zope/skel/bin/runzope.bat.in:1.2	Tue Jun 24 17:29:54 2003
+++ Zope/skel/bin/runzope.bat.in	Thu Jul 24 16:19:26 2003
@@ -1,7 +1,8 @@
 @set PYTHON=<<PYTHON>>
 @set ZOPE_HOME=<<ZOPE_HOME>>
 @set INSTANCE_HOME=<<INSTANCE_HOME>>
-@set CONFIG_FILE=%INSTANCE_HOME%\etc\zope.conf
-@set PYTHONPATH=%ZOPE_HOME%\lib\python
-@set ZOPE_RUN=%ZOPE_HOME%\lib\python\Zope\Startup\run.py
+@set SOFTWARE_HOME=<<SOFTWARE_HOME>>
+@set CONFIG_FILE=<<INSTANCE_HOME>>\etc\zope.conf
+@set PYTHONPATH=%SOFTWARE_HOME%
+@set ZOPE_RUN=%SOFTWARE_HOME%\Zope\Startup\run.py
 "%PYTHON%" "%ZOPE_RUN%" -C "%CONFIG_FILE%" %1 %2 %3 %4 %5 %6 %7


=== Zope/skel/bin/runzope.in 1.5 => 1.6 ===
--- Zope/skel/bin/runzope.in:1.5	Sun Jul  6 23:06:26 2003
+++ Zope/skel/bin/runzope.in	Thu Jul 24 16:19:26 2003
@@ -3,12 +3,11 @@
 PYTHON="<<PYTHON>>"
 ZOPE_HOME="<<ZOPE_HOME>>"
 INSTANCE_HOME="<<INSTANCE_HOME>>"
-
-CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
-
-PYTHONPATH="$ZOPE_HOME/lib/python"
+CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
+SOFTWARE_HOME="<<SOFTWARE_HOME>>"
+PYTHONPATH="$SOFTWARE_HOME"
 export PYTHONPATH
 
-ZOPE_RUN="$ZOPE_HOME/lib/python/Zope/Startup/run.py"
+ZOPE_RUN="$SOFTWARE_HOME/Zope/Startup/run.py"
 
 exec "$PYTHON" "$ZOPE_RUN" -C "$CONFIG_FILE" "$@"


=== Zope/skel/bin/zopectl.in 1.5 => 1.6 ===
--- Zope/skel/bin/zopectl.in:1.5	Sun Jul  6 23:06:26 2003
+++ Zope/skel/bin/zopectl.in	Thu Jul 24 16:19:26 2003
@@ -3,12 +3,11 @@
 PYTHON="<<PYTHON>>"
 ZOPE_HOME="<<ZOPE_HOME>>"
 INSTANCE_HOME="<<INSTANCE_HOME>>"
-
-CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
-
-PYTHONPATH="$ZOPE_HOME/lib/python"
+CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
+SOFTWARE_HOME="<<SOFTWARE_HOME>>"
+PYTHONPATH="$SOFTWARE_HOME"
 export PYTHONPATH
 
-ZDCTL="$ZOPE_HOME/lib/python/Zope/Startup/zopectl.py"
+ZDCTL="$SOFTWARE_HOME/Zope/Startup/zopectl.py"
 
 exec "$PYTHON" "$ZDCTL" -C "$CONFIG_FILE" "$@"