Rewrite some of the regexps so they don't match themselves.

This commit is contained in:
Dag-Erling Smørgrav 2005-06-04 23:18:33 +00:00
parent 495b0c0d52
commit 5bfbdca45a

View File

@ -1,19 +1,20 @@
# $FreeBSD$
# Shell code to remove FreeBSD tags before merging
grep -rl '\$Fre.BSD:' . >tags
grep -rl '\$Fre[e]BSD:' . >tags
cat tags | while read f ; do
sed -i.orig -e '/\$Fre.BSD:/d' $f
sed -i.orig -e '/\$Fre[e]BSD:/d' $f
done
# Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs
cat tags |
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$FreeBSD\$/ && print'
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$Fre[e]BSD\$/ && print'
# Shell code to reexpand FreeBSD tags
cat tags | while read f ; do
id=$(cvs diff $f | grep '\$Fre.BSD:' | sed 's/.*\(\$Fre.BSD:.*\$\).*/\1/') ;
id=$(cvs diff $f | grep '\$Fre[e]BSD:' |
sed 's/.*\(\$Fre[e]BSD:.*\$\).*/\1/') ;
if [ -n "$id" ] ; then
sed -i.orig -e "s@\\\$Fre.BSD\\\$@$id@" $f ;
sed -i.orig -e "s@\\\$Fre[e]BSD\\\$@$id@" $f ;
fi ;
done