Commit ecb1cee2 authored by Chris McDonough's avatar Chris McDonough

Take advantage of SOFTWARE_HOME expansion from mkzopeinstance.

parent 400afd32
@set PYTHON=<<PYTHON>> @set PYTHON=<<PYTHON>>
@set ZOPE_HOME=<<ZOPE_HOME>> @set ZOPE_HOME=<<ZOPE_HOME>>
@set INSTANCE_HOME=<<INSTANCE_HOME>> @set INSTANCE_HOME=<<INSTANCE_HOME>>
@set CONFIG_FILE=%INSTANCE_HOME%\etc\zope.conf @set SOFTWARE_HOME=<<SOFTWARE_HOME>>
@set PYTHONPATH=%ZOPE_HOME%\lib\python @set CONFIG_FILE=<<INSTANCE_HOME>>\etc\zope.conf
@set ZOPE_RUN=%ZOPE_HOME%\lib\python\Zope\Startup\run.py @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 "%PYTHON%" "%ZOPE_RUN%" -C "%CONFIG_FILE%" %1 %2 %3 %4 %5 %6 %7
...@@ -3,12 +3,11 @@ ...@@ -3,12 +3,11 @@
PYTHON="<<PYTHON>>" PYTHON="<<PYTHON>>"
ZOPE_HOME="<<ZOPE_HOME>>" ZOPE_HOME="<<ZOPE_HOME>>"
INSTANCE_HOME="<<INSTANCE_HOME>>" INSTANCE_HOME="<<INSTANCE_HOME>>"
CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf" SOFTWARE_HOME="<<SOFTWARE_HOME>>"
PYTHONPATH="$SOFTWARE_HOME"
PYTHONPATH="$ZOPE_HOME/lib/python"
export PYTHONPATH 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" "$@" exec "$PYTHON" "$ZOPE_RUN" -C "$CONFIG_FILE" "$@"
...@@ -3,12 +3,11 @@ ...@@ -3,12 +3,11 @@
PYTHON="<<PYTHON>>" PYTHON="<<PYTHON>>"
ZOPE_HOME="<<ZOPE_HOME>>" ZOPE_HOME="<<ZOPE_HOME>>"
INSTANCE_HOME="<<INSTANCE_HOME>>" INSTANCE_HOME="<<INSTANCE_HOME>>"
CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf" SOFTWARE_HOME="<<SOFTWARE_HOME>>"
PYTHONPATH="$SOFTWARE_HOME"
PYTHONPATH="$ZOPE_HOME/lib/python"
export PYTHONPATH export PYTHONPATH
ZDCTL="$ZOPE_HOME/lib/python/Zope/Startup/zopectl.py" ZDCTL="$SOFTWARE_HOME/Zope/Startup/zopectl.py"
exec "$PYTHON" "$ZDCTL" -C "$CONFIG_FILE" "$@" exec "$PYTHON" "$ZDCTL" -C "$CONFIG_FILE" "$@"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment