thomas: server install-kolab.sh,1.29,1.30

cvs at kolab.org cvs at kolab.org
Wed May 21 17:51:39 CEST 2008


Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
install-kolab.sh: Option to create 00INDEX.rdf files.

The user has to copy/link all packages into the current directory.
This needs to be documented elsewhere.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- install-kolab.sh	21 May 2008 15:23:30 -0000	1.29
+++ install-kolab.sh	21 May 2008 15:51:36 -0000	1.30
@@ -57,8 +57,8 @@
     echo
     echo "  -V VERSION (alternate version;             default is $KOLAB_VERSION)"
     echo
-    echo "  -D         (generate a binary distribution based on ./ and /\$PREFIX)"
-    echo "  -S         (generate a source distribution based on ./ and /\$PREFIX)"
+    echo "  -X         (generate 00INDEX.rdf for packages in the current directory"
+    echo "              using the OpenPKG installation in /\$PREFIX)"
     echo
     echo "  -B         (abort after generating the basic openpkg binary)"
     echo "  -E         (abort after generating the openpkg environment)"
@@ -66,7 +66,7 @@
     echo "  -O         (additional build options, used for openpkg bootstraping from source)"
 }
 
-while getopts hcBDSEFHi:V:p:I:u:t:O: ARGS; do
+while getopts hcBXEFHi:V:p:I:u:t:O: ARGS; do
     case $ARGS in
         h) # Display help
             usage
@@ -105,11 +105,8 @@
         c) # User wants to erase the openpkg environment
             FLAG_CLEAN="Yes"
             ;;
-        D) # User wants to collect a set of binary packages into a distribution
-            FLAG_BDIST="Yes"
-            ;;
-        S) # User wants to collect a set of source packages into a distribution
-            FLAG_SDIST="Yes"
+        X) # User wants to collect a set of packages into 00INDEX.rdf
+            FLAG_INDEX="Yes"
             ;;
         O) # User wants additional options when building OpenPK
             ADDITIONAL_BUILD_OPTS="$OPTARG"
@@ -142,7 +139,7 @@
 R_KID=`expr $KID + 1`
 N_KID=`expr $R_KID + 1`
 
-if [ -n "$FLAG_CLEAN" -o -n "$FLAG_BDIST" -o -n "$FLAG_SDIST" ]; then
+if [ -n "$FLAG_CLEAN" -o -n "$FLAG_INDEX" ]; then
     if [ -x "$PREFIX/bin/openpkg" ]; then
         if [ -n "$FLAG_CLEAN" ]; then
             echo
@@ -157,49 +154,9 @@
                 echo "Not cleaning."
                 exit 0
             fi
-        elif [ -n "$FLAG_SDIST" ]; then
-            SDIST_DIR=$PREFIX/RPM/SDIST
-            INSTALLER=`find . -name "openpkg-*.src.sh" -print`
-            if [ -z "$INSTALLER" ]; then
-                echo "No source based installer found. Unable to create a source distribution!"
-                exit 1
-            fi
-            mkdir -p $SDIST_DIR
-            cp $0 $SDIST_DIR
-            if [ -n "$INSTALLER" ]; then
-                cp $INSTALLER $SDIST_DIR
-            fi
-            if [ -n "*.src.rpm" ]; then
-                cp *.src.rpm $SDIST_DIR
-            fi
-            if [ -n "$PREFIX/RPM/PKG/*.src.rpm" ]; then
-                cp $PREFIX/RPM/PKG/*.src.rpm $SDIST_DIR
-            fi
-            chown -R $USER:$USER $SDIST_DIR
-            cd $SDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i .
-            exit 0
-        elif [ -n "$FLAG_BDIST" ]; then
+        elif [ -n "$FLAG_INDEX" ]; then
             PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
-            BDIST_DIR=$PREFIX/RPM/BDIST
-            BINARY=`find . -name "openpkg-*.$PLATTAG.sh" -print`
-            if [ -z "$BINARY" ]; then
-                echo "No binary installer package found. Unable to create a binary distribution!"
-                exit 1
-            fi
-            mkdir -p $BDIST_DIR
-            cp $0 $BDIST_DIR
-            if [ -n "$BINARY" ]; then
-                cp $BINARY $BDIST_DIR
-            fi
-            if [ -n "*$PLATTAG.rpm" ]; then
-                cp *$PLATTAG.rpm $BDIST_DIR
-            fi
-            if [ -n "$PREFIX/RPM/PKG/*$PLATTAG.rpm" ]; then
-                cp $PREFIX/RPM/PKG/*$PLATTAG.rpm $BDIST_DIR
-            fi
-            chown -R $USER:$USER $BDIST_DIR
-            cd $BDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG .
-            exit 0
+            exec $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG .
         else
             echo "\"$PREFIX\" seems to be no OpenPKG environment."
             exit 1





More information about the commits mailing list