gunnar: server cvs-kolab.sh,1.1,1.2
cvs at kolab.org
cvs at kolab.org
Mon Aug 27 18:44:44 CEST 2007
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv27988
Modified Files:
cvs-kolab.sh
Log Message:
Some fixes to the CVS installer.
Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cvs-kolab.sh 24 Aug 2007 13:49:05 -0000 1.1
+++ cvs-kolab.sh 27 Aug 2007 16:44:42 -0000 1.2
@@ -1,11 +1,13 @@
#!/bin/bash
KOLAB_PACKAGES=/kolab-packages
-KOLAB_DEV_USER=koldev
+KOLAB_DEV_USER=kolabdevel
+KOLAB_INSTALL_USER=kolabtest
ACTION_INSTALL=0
ACTION_UPDATE=0
ACTION_CLEAN=0
+ACTION_DOWNLOAD=0
FLAG_HORDE=0
FLAG_FBVIEW=0
@@ -19,27 +21,56 @@
echo "Usage:"
echo " -i create a Kolab CVS environment"
echo " -u Update the CVS and installed system"
+ echo " -D Just download the source packages"
echo " -c uninstall the Kolab CVS environment"
echo " -h (display this help)"
echo
echo "Options:"
echo " -b Package directory (default: ${KOLAB_PACKAGES})"
- echo " -d Kolab development user (default: ${KOLAB_DEV_USER})"
+ echo " -d Kolab development user/area (default: ${KOLAB_DEV_USER})"
+ echo " -t Kolab cvs testing user/area (default: ${KOLAB_INSTALL_USER})"
+ exit 1
+}
+
+die () {
+ echo $1
exit 1
}
+download() {
+ mkdir -p "${KOLAB_PACKAGES}/source-original"
+ cd "${KOLAB_PACKAGES}/source-original"
+
+ echo "Downloading Kolab-Server-2.2-Beta-1 sources..."
+
+ wget -q -r -l1 -nd --no-parent http://ftp.belnet.be/packages/kolab/server/beta/kolab-server-2.2-beta-1/sources/ || die "FAiled to download the sources!"
+
+ echo "Verifying source authenticity ..."
+
+ gpg -q --recv-key 5816791A || die "Failed to retrieve signature key!"
+ gpg -q --verify MD5SUMS || die "Invalid signature on the MD5SUMS file!"
+ md5sum --status -c MD5SUMS || die "The md5 hashes do not match. You should try to download the packages again."
+ cvs -q -d :pserver:anonymous at intevation.de:/home/kroupware/jail/kolabrepository co server/install-kolab.sh || die "Failed to retrieve the updated installer."
+ rm install-kolab.sh
+ mv server/install-kolab.sh .
+
+ if [ "${FLAG_HORDE}" == "1" -o "${FLAG_FBVIEW}" == "1" ]; then
+
+ echo "Downloading Horde support packages ..."
+
+ wget -q -r -l1 -nd --no-parent http://build.pardus.de/downloads/openpkg/ || die "Failed to download the horde support packages!"
+
+ fi
+}
+
install() {
if [ ! -e "/${KOLAB_DEV_USER}/CVS" ]; then
- mkdir -p "${KOLAB_PACKAGES}/source-original"
+ download
cd "${KOLAB_PACKAGES}/source-original"
- wget -r -l1 -nd --no-parent http://ftp.belnet.be/packages/kolab/server/beta/kolab-server-2.2-beta-1/sources/
- gpg --recv-key 5816791A
- gpg --verify MD5SUMS
- md5sum -c MD5SUMS
- cvs -d :pserver:anonymous at intevation.de:/home/kroupware/jail/kolabrepository co server/install-kolab.sh
- rm install-kolab.sh
- mv server/install-kolab.sh .
- ./install-kolab.sh -t "${KOLAB_DEV_USER}" -I 20414
+
+ echo "Installing the development environment in /${KOLAB_DEV_USER}. This will take a long time ..."
+
+ ./install-kolab.sh -t "${KOLAB_DEV_USER}" -I 21414 > kolab-build.log 2>&1
mkdir "/${KOLAB_DEV_USER}/CVS"
fi
@@ -68,12 +99,15 @@
fi
cd "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
- ./install-kolab.sh ${INSTALL_OPTS}
- ./install-kolab.sh -D
- if [ ! -e "${KOLAB_PACKAGES}/binary-kolab" ]; then
- mv /kolab/RPM/BDIST/ "${KOLAB_PACKAGES}/binary-kolab"
+
+ echo "Installing the test environment in /${KOLAB_INSTALL_USER}. This will take a long time ..."
+
+ ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -I 22414 ${INSTALL_OPTS} > kolab-build.log 2>&1
+ ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -D
+ if [ ! -e "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}" ]; then
+ mv "/${KOLAB_INSTALL_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}"
else
- rsync -avz /kolab/RPM/BDIST/ "${KOLAB_PACKAGES}/binary-kolab/"
+ rsync -avz "/${KOLAB_INSTALL_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}/"
fi
echo "Everything finished!"
@@ -95,22 +129,25 @@
./install-kolab.sh -D -t "${KOLAB_DEV_USER}"
rsync -avz "/${KOLAB_DEV_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_DEV_USER}/"
cd "${KOLAB_PACKAGES}/source-${KOLAB_DEV_USER}"
- ./install-kolab.sh ${INSTALL_OPTS}
- ./install-kolab.sh -D
- rsync -avz /kolab/RPM/BDIST/ "${KOLAB_PACKAGES}/binary-kolab/"
- /kolab/sbin/kolabconf
- /kolab/bin/openpkg rc all restart
+ ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -I 22414 ${INSTALL_OPTS} > kolab-build.log 2>&1
+ ./install-kolab.sh -t "${KOLAB_INSTALL_USER}" -D
+ rsync -avz "/${KOLAB_INSTALL_USER}/RPM/BDIST/" "${KOLAB_PACKAGES}/binary-${KOLAB_INSTALL_USER}/"
+ echo "Everything finished!"
+ echo "You should now run:"
+ echo
+ echo " /kolab/sbin/kolabconf"
+ echo " /kolab/bin/openpkg rc all restart"
exit 0
}
clean() {
- echo "This will completely wipe ${KOLAB_PACKAGES}, /${KOLAB_DEV_USER}, and /kolab."
+ echo "This will completely wipe ${KOLAB_PACKAGES}, /${KOLAB_DEV_USER}, and /${KOLAB_INSTALL_USER}."
echo "Are you certain you want to do that (YES/NO)?"
read ANSWER
if [ "$ANSWER" == "YES" ]; then
rm -rf "${KOLAB_PACKAGES}"
rm -rf "/${KOLAB_DEV_USER}"
- rm -rf "/kolab"
+ rm -rf "/${KOLAB_INSTALL_USER}"
exit 0
else
echo "Not cleaning."
@@ -120,7 +157,7 @@
-while getopts hicuHFb:d: ARGS; do
+while getopts hicuHFb:d:t: ARGS; do
case $ARGS in
h) # Display help
usage
@@ -134,6 +171,9 @@
u) # Update
ACTION_UPDATE=1
;;
+ D) # Download
+ ACTION_DOWNLOAD=1
+ ;;
H) # Include Horde in the installation
FLAG_HORDE=1
;;
@@ -146,6 +186,9 @@
d) # User wants a different development user
KOLAB_DEV_USER="${OPTARG}"
;;
+ t) # User wants a different testing user
+ KOLAB_INSTALL_USER="${OPTARG}"
+ ;;
esac
done
@@ -155,6 +198,10 @@
if [ "${FLAG_FBVIEW}" == "1" ]; then
INSTALL_OPTS="${INSTALL_OPTS} -F"
+fi
+
+if [ "${ACTION_DOWNLOAD}" == "1" ]; then
+ download
fi
if [ "${ACTION_INSTALL}" == "1" ]; then
More information about the commits
mailing list