thomas: server release-notes.txt, 1.398.2.93, 1.398.2.94 install-kolab.sh, 1.54.2.10, 1.54.2.11
cvs at kolab.org
cvs at kolab.org
Thu Dec 17 11:12:31 CET 2009
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv16663
Modified Files:
Tag: kolab_2_2_branch
release-notes.txt install-kolab.sh
Log Message:
Fix handling of -B and -E with existing OpenPKG installations.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.93
retrieving revision 1.398.2.94
diff -u -d -r1.398.2.93 -r1.398.2.94
--- release-notes.txt 16 Dec 2009 17:26:23 -0000 1.398.2.93
+++ release-notes.txt 17 Dec 2009 10:12:29 -0000 1.398.2.94
@@ -61,6 +61,8 @@
- install-kolab.sh
+ Fix handling of -B and -E with existing OpenPKG installations.
+
kolab/issue2924 (install-kolab.sh: -maxdepth/-mindepth not supported by all
find implementations)
Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.10
retrieving revision 1.54.2.11
diff -u -d -r1.54.2.10 -r1.54.2.11
--- install-kolab.sh 17 Dec 2009 09:45:05 -0000 1.54.2.10
+++ install-kolab.sh 17 Dec 2009 10:12:29 -0000 1.54.2.11
@@ -52,7 +52,7 @@
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 binary OpenPKG bootstrap package)"
+ echo " -B (abort after generating the OpenPKG bootstrap packages)"
echo " -E (abort after generating the OpenPKG environment)"
echo
echo " -O (additional build options, used for OpenPKG bootstraping from source)"
@@ -132,7 +132,7 @@
t) # User specified an alternative tag
TAG="$OPTARG"
;;
- B) # User only wants the binary OpenPKG bootstrap package
+ B) # User only wants the OpenPKG bootstrap packages
FLAG_BOOTSTRAP="Yes"
;;
E) # User only wants the OpenPKG environment
@@ -220,9 +220,13 @@
echo
echo "Received no instructions. Trying to determine required action..."
-if [ -d "$PREFIX/etc/openpkg" ]; then
+if [ -d "$PREFIX/etc/openpkg" -a -z "$FLAG_BOOTSTRAP" ]; then
# Assume an upgrade based on the current directory
INSTALL=`pwd`
+ if [ "$FLAG_ENV" ]; then
+ echo "The OpenPKG environment already exists!"
+ exit 1
+ fi
echo "Found an OpenPKG environment. Assuming upgrade..."
else
INSTALLER=`find . $FIND1 -name "openpkg-*.src.sh" -print`
@@ -286,7 +290,8 @@
--mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \
|| exit $?
if [ "$FLAG_BOOTSTRAP" ]; then
- echo "Created the binary OpenPKG bootstrap package for you platform!"
+ echo "Created the OpenPKG bootstrap packages, they are available in"
+ echo "$DIR"
exit 0
fi
fi
More information about the commits
mailing list