gunnar: server cvs-kolab.sh,1.24,1.25

cvs at kolab.org cvs at kolab.org
Thu Sep 18 21:17:52 CEST 2008


Author: gunnar

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

Modified Files:
	cvs-kolab.sh 
Log Message:
Remove the horde/fbview options.

Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cvs-kolab.sh	18 Sep 2008 11:01:23 -0000	1.24
+++ cvs-kolab.sh	18 Sep 2008 19:17:50 -0000	1.25
@@ -25,9 +25,6 @@
 ACTION_DOWNLOAD=0
 ACTION_RELEASE=0
 
-FLAG_HORDE=0
-FLAG_FBVIEW=0
-
 INSTALL_OPTS=""
 
 usage() {
@@ -46,9 +43,6 @@
     echo "  -b         Package directory (default: ${KOLAB_PACKAGES})"
     echo "  -d         Kolab development user/area (default: ${KOLAB_DEV_USER})"
     echo "  -t         Kolab cvs testing user/area (default: ${KOLAB_INSTALL_USER})"
-    echo
-    echo "  -F         Include fbview in the installation"
-    echo "  -H         Include Horde in the installation"
     exit 1
 }
 
@@ -142,7 +136,7 @@
     chown -R "${KOLAB_DEV_USER}:" "/${KOLAB_DEV_USER}/CVS"
     su - "${KOLAB_DEV_USER}" -c "cd `pwd` && make" || die "Not updating! Looks like the Kolab developers broke CVS. Bug them at https://www.intevation.de/roundup/kolab"
 
-    rsync -avz "/${KOLAB_DEV_USER}/RPM/PKG/" "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}/"
+    rsync -avz /"${KOLAB_DEV_USER}"/RPM/PKG/*.src.rpm "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}/"
 
     cd "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
 
@@ -274,12 +268,6 @@
 	D) # Download
 	    ACTION_DOWNLOAD=1
 	    ;;
-	H) # Include Horde in the installation
-	    FLAG_HORDE=1
-	    ;;
-	F) # Include Fbview in the installation
-	    FLAG_FBVIEW=1
-	    ;;
 	b) # User wants a different package directory
 	    KOLAB_PACKAGES="${OPTARG}"
 	    ;;
@@ -291,14 +279,6 @@
 	    ;;
     esac
 done
-
-if [ "${FLAG_HORDE}" == "1" ]; then
-    INSTALL_OPTS="${INSTALL_OPTS} -H"
-fi
-
-if [ "${FLAG_FBVIEW}" == "1" ]; then
-    INSTALL_OPTS="${INSTALL_OPTS} -F"
-fi
 
 if [ "${ACTION_DOWNLOAD}" == "1" ]; then
     download





More information about the commits mailing list