thomas: server obmtool.conf,1.256.2.3,1.256.2.4
cvs at kolab.org
cvs at kolab.org
Tue Sep 4 17:37:54 CEST 2007
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17153
Modified Files:
Tag: kolab_2_1_branch
obmtool.conf
Log Message:
Make installing with a different prefix/tag and userid easier.
Additionally check if /usr/bin/$TAG is an existing symlink, because the
-e check would be wrong if the link target doesn't exist.
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/Attic/obmtool.conf,v
retrieving revision 1.256.2.3
retrieving revision 1.256.2.4
diff -u -d -r1.256.2.3 -r1.256.2.4
--- obmtool.conf 3 Sep 2007 16:30:14 -0000 1.256.2.3
+++ obmtool.conf 4 Sep 2007 15:37:51 -0000 1.256.2.4
@@ -26,6 +26,11 @@
echo "---- boot/build ${NODE} %${CMD} ----"
kolab_version="2.1.0+cvs";
PREFIX=/${CMD};
+ TAG="${CMD}"
+ KID="19414"
+ R_KID=$(($KID + 1))
+ N_KID=$(($R_KID + 1))
+ KOLABTOOL="/usr/bin/$TAG"
loc='./' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
plusloc='./'
altloc='./'
@@ -42,11 +47,11 @@
# start from scratch or upgrade within 2.0.x
@install ${loc}openpkg-2.5.4-2.5.4 \
- --tag="kolab" \
+ --tag="$TAG" \
--prefix="${PREFIX}" \
--user="${CMD}" --group="${CMD}" \
- --muid="19414" --ruid="19415" --nuid="19416" \
- --mgid="19414" --rgid="19415" --ngid="19416"
+ --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \
+ --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID"
if test -n "$USERNAME" ; then
$PREFIX/bin/openpkg register --mode=post --user=$USERNAME
@@ -163,10 +168,10 @@
@install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
@check
- if test ! -e "/usr/bin/kolab" ; then
+ if test ! -e "$KOLABTOOL" -a ! -h "$KOLABTOOL" ; then
echo
- echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab"
- ln -s $PREFIX/bin/kolab /usr/bin/kolab
+ echo "Adding symbolic link to $PREFIX/bin/kolab as $KOLABTOOL"
+ ln -s "$PREFIX/bin/kolab" "$KOLABTOOL"
fi
More information about the commits
mailing list