Browse Source

Rene Rebe:


			
			
				rocklinux
			
			
		
Rene Rebe 21 years ago
parent
commit
e83e032d26
2 changed files with 20 additions and 22 deletions
  1. +16
    -17
      scripts/Create-CkSumPatch
  2. +4
    -5
      scripts/Create-CopyPatch

+ 16
- 17
scripts/Create-CkSumPatch

@ -42,8 +42,7 @@ else
fi
fi
echo "Creating cksum.patch ..."
echo -n > cksum.patch
echo "Creating cksum.patch ..." >&2
./scripts/Download -list-cksums | grep '^00* ' | \
while read cksum gzfile ; do
@ -63,13 +62,13 @@ while read cksum gzfile ; do
fi
if [[ "$bzfile" = *.bz2 ]] || [[ "$bzfile" = *.tbz2 ]] ; then
echo -n "$bzfile (bzip2): "
echo -n "$bzfile (bzip2): " >&2
cksum="`bunzip2 < $bzfile | cksum | cut -f1 -d' '`"
else
echo -n "$gzfile (raw): "
echo -n "$gzfile (raw): " >&2
cksum="`cksum "$gzfile" | cut -f1 -d' '`"
fi
echo $cksum
echo $cksum >&2
rep="`echo $bzfile | cut -f2 -d/`"
@ -82,16 +81,16 @@ while read cksum gzfile ; do
sedscript="s,\[D\] *00* *$xfile,[D] $cksum $xfile,"
sed "$sedscript" < $descfile > /tmp/$$
if cmp -s ./$descfile /tmp/$$ ; then
echo "!!! SED script didn't change anything:"
echo "!!! $sedscript"
echo "!!! SED script didn't change anything:" >&2
echo "!!! $sedscript" >&2
else
{ echo "diff -u0 ./$descfile /tmp/$$"
diff -u0 ./$descfile /tmp/$$ ; } >> cksum.patch
diff -u0 ./$descfile /tmp/$$ ; }
fi
rm -f /tmp/$$
else
echo "!!! No Desc File for $gzfile"
echo "!!! (My guess was $descfile)"
echo "!!! No Desc File for $gzfile" >&2
echo "!!! (My guess was $descfile)" >&2
fi
elif [ -d target/$rep -o "$rep" = misc ] ; then
if [ -d target/$rep ] ; then
@ -105,20 +104,20 @@ while read cksum gzfile ; do
sedscript="s,^00* *$xfile,$cksum $xfile,"
sed "$sedscript" < $descfile > /tmp/$$
if cmp -s ./$descfile /tmp/$$ ; then
echo "!!! SED script didn't change anything:"
echo "!!! $sedscript"
echo "!!! SED script didn't change anything:" >&2
echo "!!! $sedscript" >&2
else
{ echo "diff -u0 ./$descfile /tmp/$$"
diff -u0 ./$descfile /tmp/$$ ; } >> cksum.patch
diff -u0 ./$descfile /tmp/$$ ; }
fi
rm -f /tmp/$$
else
echo "!!! No Desc File for $gzfile"
echo "!!! (My guess was $descfile)"
echo "!!! No Desc File for $gzfile" >&2
echo "!!! (My guess was $descfile)" >&2
fi
else
echo "!!! No Desc File for $gzfile"
echo "!!! (I didn't have any possible guesses)"
echo "!!! No Desc File for $gzfile" >&2
echo "!!! (I didn't have any possible guesses)" >&2
fi
fi
done

+ 4
- 5
scripts/Create-CopyPatch

@ -43,8 +43,7 @@ version.
EOT
echo "Creating copy.patch (this may take a while) ..."
echo -n > copy.patch
echo "Creating copy.patch (this may take a while) ..." >&2
[ $# = 0 ] && set Documentation/. architecture/. misc/. \
package/. scripts/. target/.
@ -115,12 +114,12 @@ do
grep -A 100000 -- '--- ROCK-COPYRIGHT-NOTE-END ---' $oldfile
} > $newfile
if ! cmp -s $oldfile $newfile ; then
echo "Creating patch for $filename."
echo "Creating patch for $filename." >&2
diff -u ./$filename $newfile |
sed -e "2 s,$newfile,./$filename," >> copy.patch
sed -e "2 s,$newfile,./$filename,"
fi
else
echo "WARNING: No Copyright tags in $filename found!"
echo "WARNING: No Copyright tags in $filename found!" >&2
fi
done

Loading…
Cancel
Save