SOURCES: installzope3package - fix symlinks; fix -d producing erro...

[arekm]

Author: arekm                        Date: Wed Dec 21 14:07:04 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix symlinks; fix -d producing error (treated as test -d)

---- Files affected:
SOURCES:
   installzope3package (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/installzope3package
diff -u SOURCES/installzope3package:1.2 SOURCES/installzope3package:1.3
--- SOURCES/installzope3package:1.2	Tue Dec 20 23:15:46 2005
+++ SOURCES/installzope3package	Wed Dec 21 15:06:59 2005
@@ -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>"
@@ -16,8 +19,8 @@
 if [ "${pkg_dir}" != "-d" ] ; then
 	for instance in $AUTO_INSTALL_PRODUCTS ; do
 		[ -e "/etc/zope3/zopeskel/package-includes/${pkg_name}-meta.zcml" ] && \
-			ln -s "/etc/zope3/zopeskel/package-includes/${pkg_name}-meta.zcml" "/etc/zope3/${instance}/package-includes"
-		ln -s "/etc/zope3/zopeskel/package-includes/${pkg_name}-configure.zcml" "/etc/zope3/${instance}/package-includes"
+			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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/installzope3package?r1=1.2&r2=1.3&f=u