thomas: server install-kolab.sh,1.26,1.27

cvs at kolab.org cvs at kolab.org
Wed May 7 17:14:14 CEST 2008


Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
fix kolab/issue2686 (unquoted wildcards in install-kolab.sh)


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- install-kolab.sh	5 May 2008 10:00:13 -0000	1.26
+++ install-kolab.sh	7 May 2008 15:14:11 -0000	1.27
@@ -159,7 +159,7 @@
 			fi
 		elif [ -n "$FLAG_SDIST" ]; then
 			SDIST_DIR=$PREFIX/RPM/SDIST
-			INSTALLER=`find . -name openpkg-*.src.sh -print`
+			INSTALLER=`find . -name "openpkg-*.src.sh" -print`
 			if [ -z "$INSTALLER" ]; then
 				echo "No source based installer found. Unable to create a source distribution!"
 				exit 1
@@ -181,7 +181,7 @@
 		elif [ -n "$FLAG_BDIST" ]; then
 			PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
 			BDIST_DIR=$PREFIX/RPM/BDIST
-			BINARY=`find . -name openpkg-*$PLATTAG.sh -print`
+			BINARY=`find . -name "openpkg-*.$PLATTAG.sh" -print`
 			if [ -z "$BINARY" ]; then
 				echo "No binary installer package found. Unable to create a binary distribution!"
 				exit 1
@@ -225,8 +225,8 @@
 		INSTALL=`pwd`
 		echo "Found an OpenPKG environment. Assuming upgrade..."
 	else
-		INSTALLER=`find . -name openpkg-*.src.sh -print`
-		BINARY=`find . -name openpkg-*.sh \! -name openpkg-*.src.sh -print`
+		INSTALLER=`find . -name "openpkg-*.src.sh" -print`
+		BINARY=`find . -name "openpkg-*.sh" \! -name "openpkg-*.src.sh" -print`
 		if [ -z "$INSTALLER" ]; then
 			# No install script? Determine if there is a binary script
 			if [ -z "$BINARY" ]; then





More information about the commits mailing list