Changes in npl/rebuildcheck [0c25615:bc164b0]

File:

• npl/rebuildcheck (modified) (7 diffs)

npl/rebuildcheck

@@ -47 +47 @@
 {
         DIR=$1
-        MD5=`ls -lR "$DIR"|md5sum`
+        MD5=`ls -lR "$DIR"|md5sum` 
         ! grep -x "$MD5" "$DIR/.signature" &>/dev/null
 }
@@ -81 +81 @@
 if ! [ "$ignoremd5" ]; then
         pushd "$DIR" >/dev/null || exit 1
-        find . -type f |
+        find . -type f | 
                 #negeer bepaalde files
-                egrep -v $IGNORE_REGEX |
+                egrep -v $IGNORE_REGEX | 
                 while read FILE; do
                         MD5=`md5sum "$FILE"`
@@ -91 +91 @@
                                 exit 2 #exit 2, rebuild dus
                         fi
-                done
+                done 
         RET=$?
         popd >/dev/null
-
-        if [ "$RET" == "2" ]; then
+        
+        if [ "$RET" == "2" ]; then 
                 REBUILD=1
-        elif [ "$RET" != "0" ]; then
+        elif [ "$RET" != "0" ]; then 
                 msg "ERROR!"
                 exit 1
@@ -127 +127 @@
 
 
-#if we need to rebuild because of a DEPERROR, check our direct dependencys first so that we rebuild the
+#if we need to rebuild because of a DEPERROR, check our direct dependencys first so that we rebuild the 
 #"deepest" stuff first.
 if ! [ "$ignoredep" ] && [ "$DEPERROR" == "1" ]; then
         for DEP in $DEPS; do
                 #zoek de buildbase op, als deze er al is
-                if BUILDBASE=`./findbuild "$DEP"` 2>/dev/null; then
+                if BUILDBASE=`./findbuild "$DEP"` 2>/dev/null; then 
                         msg "Dependency check $DEP"
                         #note: niet de parameters meegeven, anders gaat hij alles rebuilden bij een force
@@ -169 +169 @@
                 if grep '#NOBUILDROOT' "$BUILDFILE" >/dev/null; then
                         msg "Building package without buildroot!"
-                        (
+                        ( 
                                 cd `dirname $BUILDFILE` || exit 1
                                 $BUILDFILE $* || exit 1
                         ) || fatal
                 else
-                        (
+                        ( 
                                 cd ../builder
                                 ./runrooted "$BUILDFILE" $*
@@ -193 +193 @@
                                 echo
                                 echo "################## DIFF of $PKG:"
-                                ./diffpkg $PKG
+                                ./diffpkg $PKG 
                                 echo "################## end of DIFF $PKG "
                         fi
                 done
-
-                msg "Updating build numbers for $BUILDFILE..."
-                pushd $DIR > /dev/null
-                for PKG in *.pkg; do
-                        BUILD_FILE=`echo "$PKG"| sed 's/.pkg$//'`.build
-                        BUILD=`cat $BUILD_FILE 2>/dev/null`
-                        if [ "$BUILD" == "" ]; then
-                                BUILD=1
-                        else
-                                (( BUILD=BUILD+1 ))
-                        fi
-                        echo $BUILD > $BUILD_FILE || exit 1
-                done
-                popd >/dev/null
-
         else
                 msg "Not building, only updating md5 sums.."
         fi
-
-
-
-
+        
         msg "Updating md5 for $BUILDFILE..."
         #bepaal en bewaar major versies waartegen we gebuild hebben
         rm $MD5FILE &>/dev/null
         pushd $DIR >/dev/null
-        find . -type f| sort |
+        find . -type f| sort | 
                 #negeer bepaalde files
-                egrep -v $IGNORE_REGEX |
+                egrep -v $IGNORE_REGEX | 
                 while read FILE; do
                         md5sum "$FILE" >> $MD5FILE
                 done
         popd > /dev/null
-
+                
         msg "Updating dependency information for $BUILDFILE..."
         DEPVERFILE=`echo $BUILDFILE | sed 's/.SlackBuild$//g'`.depver
@@ -253 +235 @@
 #store_dir "$DIR"
 exit 0
+
+