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

svn at pcbsd.org svn at pcbsd.org
Mon Jan 12 11:42:52 PST 2009


Author: kris
Date: 2009-01-12 11:42:52 -0800 (Mon, 12 Jan 2009)
New Revision: 3231

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

Updated our version function to use ^ for variables, so we don't get funky makefile errors



Modified: pbibuild/pbibuilder/scripts/functions.sh
===================================================================
--- pbibuild/pbibuilder/scripts/functions.sh	2009-01-12 19:29:08 UTC (rev 3230)
+++ pbibuild/pbibuilder/scripts/functions.sh	2009-01-12 19:42:52 UTC (rev 3231)
@@ -14,17 +14,17 @@
   if [ -z "${PORTVER}" ]
   then
    # Get the port version number
-   PORTVER="`grep DISTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
+   PORTVER="`grep ^DISTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
   fi
 
   if [ -z "${PORTVER}" ]
   then
 
    # Now try the PORTVERSION= line
-   PORTVER="`grep PORTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
+   PORTVER="`grep ^PORTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
    if [ -z "$PORTVER" -o "${PORTVER}" = " " ]
    then
-    PORTVER="`grep PORTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 3`"
+    PORTVER="`grep ^PORTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 3`"
    fi
 
   fi
@@ -32,16 +32,16 @@
   if [ -z "${PORTVER}" ]
   then
    # Now try the DISTVERSION?= line
-   PORTVER="`grep DISTVERSION?= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
+   PORTVER="`grep ^DISTVERSION?= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
   fi
 
 
   # Check if we have a portrevision to use in version number
-  cat ${PDESTDIR}/${PBIPORT}/Makefile | grep "PORTREVISION=" >/dev/null
+  cat ${PDESTDIR}/${PBIPORT}/Makefile | grep "^PORTREVISION=" >/dev/null
   if [ "$?" = "0" ]
   then
     PORTREV=""
-    PORTREV="`grep PORTREVISION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
+    PORTREV="`grep ^PORTREVISION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
     PORTVER="${PORTVER}_${PORTREV}" ; export PORTVER
   fi
 



More information about the Commits mailing list