X-Git-Url: http://git.pld-linux.org/?p=packages%2FZope3.git;a=blobdiff_plain;f=installzope3package;h=8df8f10a8f6c61634b557907b8c83548010fe4c6;hp=adb8149437b32502f8c2e66f2ae39125344dbbc8;hb=564ce4bf73b79bf13f70a6feb781955ab329a95a;hpb=500758baeb2e7522e11d137d6e3e8c778492d718

diff --git a/installzope3package b/installzope3package
index adb8149..8df8f10 100644
--- a/installzope3package
+++ b/installzope3package
@@ -3,7 +3,10 @@
 pkg_dir="$1"
 pkg_name="$2"
 
-if [ "${pkg_dir}" != "-d" -a ! -d "${pkg_dir}" -o -z "${pkg_name}" ] ; then
+is_d=0
+[ "${pkg_dir}" = "-d" ] && is_d=1
+
+if [ "${is_d}" -eq 0 -a ! -d "${pkg_dir}" -o -z "${pkg_name}" ] ; then
 	echo "Usage:" >&2
 	echo "   $0 <package_directory> <package_name>"
 	echo "   $0 [-d] <package_name>"
@@ -15,7 +18,9 @@ AUTO_INSTALL_PRODUCTS=main
 
 if [ "${pkg_dir}" != "-d" ] ; then
 	for instance in $AUTO_INSTALL_PRODUCTS ; do
-		ln -s "/etc/zope3/zopeskel/package-includes/${pkg_name}"-{meta,configure}.zcml "/etc/zope3/${instance}/package-includes"
+		[ -e "/etc/zope3/zopeskel/package-includes/${pkg_name}-meta.zcml" ] && \
+			ln -s "/etc/zope3/zopeskel/etc/package-includes/${pkg_name}-meta.zcml" "/etc/zope3/${instance}/package-includes"
+		ln -s "/etc/zope3/zopeskel/etc/package-includes/${pkg_name}-configure.zcml" "/etc/zope3/${instance}/package-includes"
 	done
 else
 	for instance in $AUTO_INSTALL_PRODUCTS ; do