wilde: server install-kolab.sh,1.33,1.34
cvs at kolab.org
cvs at kolab.org
Fri Jul 4 17:26:25 CEST 2008
Author: wilde
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv14628
Modified Files:
install-kolab.sh
Log Message:
Install Horde and FBview per default.
Removed -H and -F from install-kolab.
Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- install-kolab.sh 4 Jul 2008 14:38:53 -0000 1.33
+++ install-kolab.sh 4 Jul 2008 15:26:23 -0000 1.34
@@ -20,15 +20,13 @@
INSTALL=""
-PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin"
+PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin fbview-kronolith horde-kolab-client"
DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
#Flags
FLAG_BASE=""
FLAG_ENV=""
FLAG_CLEAN=""
-FLAG_FBVIEW=""
-FLAG_HORDE=""
usage() {
echo "Usage:"
@@ -36,12 +34,6 @@
echo
echo "Options:"
echo
- echo " -H (install the Horde groupware web client)"
- echo " -F (install the free/busy view frontend)"
- echo " -h (display this help)"
- echo
- echo "Advanced options:"
- echo
echo " -t TAG (alternate binary tag; default is kolab)"
echo " -I UID (alternate base uid; default is 19414)"
echo
@@ -59,6 +51,8 @@
echo " -E (abort after generating the openpkg environment)"
echo
echo " -O (additional build options, used for openpkg bootstraping from source)"
+ echo
+ echo " -h (display this help)"
}
mktmpdir() {
@@ -113,12 +107,6 @@
E) # User only wants the basic openpkg environment
FLAG_ENV="Yes"
;;
- F) # User wants to install fbview
- FLAG_FBVIEW="Yes"
- ;;
- H) # User wants to install Horde
- FLAG_HORDE="Yes"
- ;;
c) # User wants to erase the openpkg environment
FLAG_CLEAN="Yes"
;;
@@ -138,15 +126,6 @@
if [ -z "$USER" ]; then
USER=$TAG
-fi
-
-if [ "$FLAG_HORDE" ]; then
- DEFINE="$DEFINE -D kolabd::with_horde"
- PACKAGES="$PACKAGES horde-kolab-client"
-fi
-
-if [ "$FLAG_FBVIEW" ]; then
- PACKAGES="$PACKAGES fbview-kronolith"
fi
if [ -z "$PREFIX" ]; then
More information about the commits
mailing list