From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/site/luci/bin runzope zopectl
Date: 11 Jul 2006 14:51:17 -0000 [thread overview]
Message-ID: <20060711145117.26544.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-07-11 14:51:16
Modified files:
luci/site/luci/bin: runzope zopectl
Log message:
fix breakage caused by the fc6 zope2.8 -> zope2.9 upgrade
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/runzope.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/zopectl.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- conga/luci/site/luci/bin/runzope 2006/06/26 22:01:17 1.2
+++ conga/luci/site/luci/bin/runzope 2006/07/11 14:51:16 1.3
@@ -11,7 +11,12 @@
INSTANCE_HOME="/var/lib/luci"
CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
-SOFTWARE_HOME="$ZOPE_HOME/lib/python"
+if [ -d "$ZOPE_HOME/lib64/python" ]; then
+ SOFTWARE_HOME="$ZOPE_HOME/lib64/python"
+else
+ SOFTWARE_HOME="$ZOPE_HOME/lib/python"
+fi
+
PYTHONPATH="$SOFTWARE_HOME"
export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
--- conga/luci/site/luci/bin/zopectl 2006/05/30 20:17:21 1.1
+++ conga/luci/site/luci/bin/zopectl 2006/07/11 14:51:16 1.2
@@ -1,11 +1,24 @@
#! /bin/sh
PYTHON="/usr/bin/python"
-ZOPE_HOME="/usr/lib/zope"
+
+if [ -d /usr/lib64/zope ]; then
+ ZOPE_HOME="/usr/lib64/zope"
+else
+ ZOPE_HOME="/usr/lib/zope"
+fi
+
INSTANCE_HOME="/var/lib/luci"
-CONFIG_FILE="/var/lib/luci/etc/zope.conf"
-SOFTWARE_HOME="/usr/lib/zope/lib/python"
+CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
+
+if [ -d "$ZOPE_HOME/lib64/python" ]; then
+ SOFTWARE_HOME="$ZOPE_HOME/lib64/python"
+else
+ SOFTWARE_HOME="$ZOPE_HOME/lib/python"
+fi
+
PYTHONPATH="$SOFTWARE_HOME"
+
export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
ZDCTL="$SOFTWARE_HOME/Zope2/Startup/zopectl.py"
reply other threads:[~2006-07-11 14:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060711145117.26544.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.