thomas: server release-notes.txt, 1.419, 1.420 install-kolab.sh, 1.56, 1.57

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23337

Modified Files:
	release-notes.txt install-kolab.sh 
Log Message:
Fix kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all find implementations)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -d -r1.419 -r1.420
--- release-notes.txt	20 Mar 2009 16:33:12 -0000	1.419
+++ release-notes.txt	24 Mar 2009 15:47:54 -0000	1.420
@@ -12,6 +12,11 @@
 
 	Activated the HASH and JSON modules.
 
+    - install-kolab.sh
+
+	kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
+	                 find implementations)
+
     - Kolab_Filter-0.1.5-2009????
 
 	kolab/issue1336 (Resource booking fails, if TRANSP:TRANSPARENT in the

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- install-kolab.sh	13 Mar 2009 12:19:36 -0000	1.56
+++ install-kolab.sh	24 Mar 2009 15:47:54 -0000	1.57
@@ -59,6 +59,16 @@
     echo "  -h         (display this help)"
 }
 
+# check if find command supports -mindepth and -maxdepth, see
+# kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all find implementations)
+if [ "`find / -mindepth 0 -maxdepth 0 2>/dev/null`" = "/" ]; then
+    FIND1="-mindepth 1 -maxdepth 1"
+else
+    echo "WARNING: Your find does not support -mindepth/-maxdepth, make sure" >&2
+    echo "you are in the correct directory, see issues.kolab.org/issue2924" >&2
+    FIND1=""
+fi
+
 mktmpdir() {
   newtmp="${TMPDIR-/tmp}/install-kolab.$RANDOM.$RANDOM.$RANDOM.$$"
   (umask 022 && mkdir "$newtmp") || {
@@ -81,7 +91,7 @@
   cp "$SRCDIR"/openpkg-2*.rpm "$WORKDIR"
   cp "$SRCDIR"/openpkg-*.sh "$WORKDIR"
   ln -sf "$SRCDIR/00INDEX.rdf" "$WORKDIR"
-  find "$SRCDIR" -mindepth 1 -maxdepth 1 -name "*.rpm" \! -name "openpkg-2*.rpm" -exec ln -sf '{}' "$WORKDIR" \;
+  find "$SRCDIR" $FIND1 -name "*.rpm" \! -name "openpkg-2*.rpm" -exec ln -sf '{}' "$WORKDIR" \;
 }
 
 remove_from_list() {
@@ -174,7 +184,7 @@
                 exit 0
             fi
         elif [ "$FLAG_INDEX" ]; then
-            BINARY=`find . -mindepth 1 -maxdepth 1 -name "openpkg-2*.rpm" \! -name "openpkg-*.src.rpm" -print`
+            BINARY=`find . $FIND1 -name "openpkg-2*.rpm" \! -name "openpkg-*.src.rpm" -print`
             if [ -z "$BINARY" ]; then
                 echo "Generating 00INDEX.rdf for source distribution ..."
                 exec "$PREFIX/bin/openpkg" index -r . -o 00INDEX.rdf -C $PREFIX/RPM/DB/00INDEX-cache.db -i .
@@ -215,8 +225,8 @@
         INSTALL=`pwd`
         echo "Found an OpenPKG environment. Assuming upgrade..."
     else
-        INSTALLER=`find . -name "openpkg-*.src.sh" -print`
-        BINARY=`find . -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print`
+        INSTALLER=`find . $FIND1 -name "openpkg-*.src.sh" -print`
+        BINARY=`find . $FIND1 -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print`
         if [ -z "$INSTALLER" ]; then
             # No install script? Determine if there is a binary script
             if [ -z "$BINARY" ]; then
@@ -301,7 +311,7 @@
 
     PACKAGES=`remove_from_list "$EXCLUDEPKGS" "$PACKAGES"`
 
-    find "$DIR" -mindepth 1 -maxdepth 1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \;
+    find "$DIR" $FIND1 -name "*.$PLATTAG.rpm" -exec ln -sf '{}' "$PREFIX/RPM/PKG/" \;
     echo "----------- SETUP COMPLETED -----------"
     echo
     echo " Now running:"