Revision: 5923
http://gar.svn.sourceforge.net/gar/?rev=5923&view=rev
Author: dmichelsen
Date: 2009-08-07 21:23:03 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
cswutils: Fix issue #2869 according to James patch
Modified Paths:
--------------
csw/mgar/pkg/cswutils/trunk/checksums
csw/mgar/pkg/cswutils/trunk/files/checkpkg
csw/mgar/pkg/cswutils/trunk/files/createpkg
Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums 2009-08-07 20:13:19 UTC (rev
5922)
+++ csw/mgar/pkg/cswutils/trunk/checksums 2009-08-07 21:23:03 UTC (rev
5923)
@@ -1,8 +1,8 @@
091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING
-94fc299b1be5cc4c20f92721ef43573b download/checkpkg
+30b6598a4453e3ce0c1fabeede5eb5f8 download/checkpkg
6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8
9a637f6546cc50974159a987302d91c0 download/cpan2pkg
-44e944a12a8691068de0c95e1052a922 download/createpkg
+93b6a811d303ce3be0050c5a7b3c8e69 download/createpkg
a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8
cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg
8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8
Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg
===================================================================
--- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2009-08-07 20:13:19 UTC (rev
5922)
+++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2009-08-07 21:23:03 UTC (rev
5923)
@@ -145,12 +145,15 @@
basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE`
pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1`
-case $software in
- *[A-Z]*)
+isLower(){
+ typeset -l LOWER=$1
+ [ "$LOWER" = "$1" ]
+}
+
+if ! isLower $software ; then
echo ERROR: $software must be all lowercase
exit 1
- ;;
-esac
+fi
case `basename $f` in
${software}-${version}-*)
Modified: csw/mgar/pkg/cswutils/trunk/files/createpkg
===================================================================
--- csw/mgar/pkg/cswutils/trunk/files/createpkg 2009-08-07 20:13:19 UTC (rev
5922)
+++ csw/mgar/pkg/cswutils/trunk/files/createpkg 2009-08-07 21:23:03 UTC (rev
5923)
@@ -87,12 +87,15 @@
PKGREV=`sed -n 's/^VERSION=//p' pkginfo`
SOFTNAME=`sed -n 's/^NAME=//p' pkginfo|awk '{print $1}'`
-case $SOFTNAME in
- *[A-Z]*)
+isLower(){
+ typeset -l LOWER=$1
+ [ "$LOWER" = "$1" ]
+}
+
+if ! isLower $SOFTWARE ; then
echo ERROR: $SOFTNAME must be all lowercase
exit 1
- ;;
-esac
+fi
PKGFILE=$SOFTNAME-$PKGREV-SunOS`uname -r`-$ARCH-CSW.pkg
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
