[PC-BSD Commits] r3191 - pbibuild/pbibuilder/scripts

[svn at pcbsd.org]

Author: kris
Date: 2009-01-07 07:42:44 -0800 (Wed, 07 Jan 2009)
New Revision: 3191

Modified:
   pbibuild/pbibuilder/scripts/functions.sh
Log:

Fixed a bug in our PBI building script which causes the PBIVERSION to sometimes be set incorrectly from a previous variable



Modified: pbibuild/pbibuilder/scripts/functions.sh
===================================================================
--- pbibuild/pbibuilder/scripts/functions.sh	2009-01-07 15:03:02 UTC (rev 3190)
+++ pbibuild/pbibuilder/scripts/functions.sh	2009-01-07 15:42:44 UTC (rev 3191)
@@ -2,6 +2,8 @@
 
 find_port_ver()
 {
+  PORTVER=""
+
   # Check if we have a custom version string key and try to set PORTVER
   if [ ! -z "${VERKEY}" ]
   then
@@ -35,9 +37,10 @@
 
 
   # Check if we have a portrevision to use in version number
-  cat ${PDESTDIR}/${PBIPORT}/Makefile | grep "PORTREVISION="
+  cat ${PDESTDIR}/${PBIPORT}/Makefile | grep "PORTREVISION=" >/dev/null
   if [ "$?" = "0" ]
   then
+    PORTREV=""
     PORTREV="`grep PORTREVISION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
     PORTVER="${PORTVER}_${PORTREV}" ; export PORTVER
   fi