[Cluster-devel] conga/luci/site/luci/bin runzope zopectl

[Cluster-devel] conga/luci/site/luci/bin runzope zopectl

[rmccabe]

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"