Changeset d849d83 for npl

Timestamp:

01/17/17 22:54:06 (8 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

gcc484, master, ntop, perl-5.22

Children:

72a275e

Parents:

0105685

Message:

build number stuff

Location:

npl

Files:

• pkgname (modified) (1 diff)
• rebuildcheck (modified) (1 diff)

npl/pkgname

@@ -17 +17 @@
         VER=`cat $DIR/$NAME.version` || exit 1
         ARCH=`cat $DIR/$NAME.arch|sed s/-/_/g` || exit 1
-
-        #build nr bepalen mbv svn
-        SVNSTATUS=`svn status -v "$PKG"` || exit 1
-        BUILD=`echo "$SVNSTATUS" | egrep -o '[0-9]+' | head -n 2 | tail -n1`
-        MOD=`echo "$SVNSTATUS"|cut -b1-2`
-
-        #naam aanpassen als hij nieuw of gemod is
-        APPEND=
-        if [ "$BUILD" == "?" ]; then
-                BUILD="new"
-        else
-                #gemodified?
-                if [ "$MOD" != "  " ]; then
-                        APPEND=mod
-                fi
-        fi              
-
+        BUILD=`cat $DIR/$NAME.build` || exit 1
+        
 
         #bevat 1 van de packagenaam onderdelen illegale tekens?
-        if echo "$NAME$VER$ARCH$BUILD$APPEND" | grep '[^a-zA-Z0-9._+]' &>/dev/null; then
-            echo "FOUT: Package naam '$NAME-$VER-$ARCH-$BUILD$APPEND' bevat illegale tekens!" >&2
+        if echo "$NAME$VER$ARCH$BUILD" | grep '[^a-zA-Z0-9._+]' &>/dev/null; then
+            echo "FOUT: Package naam '$NAME-$VER-$ARCH-$BUILD' bevat illegale tekens!" >&2
             exit 1          
         fi
                 
-        echo "$NAME-$VER-$ARCH-$BUILD$APPEND.tgz"
+        echo "$NAME-$VER-$ARCH-$BUILD.tgz"
 fi
 

npl/rebuildcheck

@@ -3 +3 @@
 BUILDFILE=$1
 DEPTH=$2
-IGNORE_REGEX='/CVS/|md5$|/\.svn|/\.cvs|/docs|~$|\.depver$|\.arch$|\.version$|\.major$|\.check$|\.check\.ok$';
+IGNORE_REGEX='/CVS/|md5$|/\.git|/\.svn|/\.cvs|/docs|~$|\.depver$|\.arch$|\.version$|\.major$|\.check$|\.check\.ok$';
 if [ ! "`id -u`" = "0" ]; then
 echo "root priviliges required. Quiting...";