- added R: hotfix050405 (security)

[packages/Zope.git] / Zope-zopectl

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 $*