- updated

Changed files:
    Zope-mkzopeinstance -> 1.2
    Zope-runzope -> 1.2
    Zope-zopectl -> 1.2

diff --git a/Zope-mkzopeinstance b/Zope-mkzopeinstance
index d24d122978bb3e949d659111277e894b14c78333..7742ccbbb2b6f9159afe18b0889b3906aeaf6dc4 100644 (file)
--- a/Zope-mkzopeinstance
+++ b/Zope-mkzopeinstance
@@ -21,9 +21,14 @@ python /usr/lib/zope/mkzopeinstance.py \
        -d "$destdir" \
        $namepass || exit $?
 
+install -d "/etc/zope/$name"
 mv "${destdir}"/etc/* "/etc/zope/$name"
 
-chown root.zope ${destdir}
-chmod 770 ${destdir}
-chown -R zope.zope ${destdir}/*
-chmod a+X  ${destdir}/*
+chmod a+x "${destdir}"/bin/*
+
+install -d "/var/log/zope/$name"
+
+chown root.zope "${destdir}" "/var/log/zope/$name"
+chmod 770 "${destdir}" "/var/log/zope/$name"
+chown -R zope.zope "${destdir}"/*
+chmod a+X  "${destdir}"/*

diff --git a/Zope-runzope b/Zope-runzope
index a136d6e4e428912032a16ccb7456756f223d9541..236e9f52932fd8849b0c765ec21ea2069cd5b7ff 100644 (file)
--- a/Zope-runzope
+++ b/Zope-runzope
@@ -1,12 +1,10 @@
 #!/bin/sh
 
-if [ -n "$1" ] ; then
+if [ -n "$1" -a -d /var/lib/zope/"$1" ] ; then
        instance="$1"
        shift
 else
        instance="main"
 fi
 
-PYTHONPATH="/usr/lib/zope"; export PYTHONPATH
-exec /usr/bin/python "/usr/lib/zope/Zope/Startup/run.py" \
-       -C "/etc/zope/$instance/zope.conf" "$@"
+exec /var/lib/zope/"$instance"/bin/runzope $*

diff --git a/Zope-zopectl b/Zope-zopectl
index e5375c128162699142b13b8244cca781f7db7ae9..d9d7da2144d071fc633d0c1551977d6b3f1d49a6 100644 (file)
--- a/Zope-zopectl
+++ b/Zope-zopectl
@@ -1,11 +1,10 @@
 #!/bin/sh
 
-if [ -n "$1" ] ; then
+if [ -n "$1" -a -d /var/lib/zope/"$1" ] ; then
        instance="$1"
+       shift
 else
        instance="main"
 fi
 
-PYTHONPATH="/usr/lib/zope"; export PYTHONPATH
-exec /usr/bin/python "/usr/lib/zope/Zope/Startup/zopectl.py" \
-       -C "/etc/zope/$instance/zope.conf" "$@"
+exec /var/lib/zope/"$instance"/bin/zopectl $*