diff options
| -rw-r--r-- | crypto/openssh/FREEBSD-tricks | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/openssh/FREEBSD-tricks b/crypto/openssh/FREEBSD-tricks index 7234126..fdf78c7 100644 --- a/crypto/openssh/FREEBSD-tricks +++ b/crypto/openssh/FREEBSD-tricks @@ -1,20 +1,19 @@ # $FreeBSD$ # Shell code to remove FreeBSD tags before merging -grep -rl '\$Fre.BSD:' . | -while read f ; do +grep -rl '\$Fre.BSD:' . >tags +while read f < tags ; do sed -i.orig -e '/\$Fre.BSD:/d' $f done # Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs -egrep -rl '\$(Id|OpenBSD):' . | +cat tags | xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$FreeBSD\$/ && print' # Shell code to reexpand FreeBSD tags -grep -rl '\$FreeBSD\$' . | -while read f ; do +while read f < tags ; do id=$(cvs diff $f | grep '\$Fre.BSD:' | sed 's/.*\(\$Fre.BSD:.*\$\).*/\1/') ; - if [ -n "$id" ] ; then + if [ -n "$id" ] ; then sed -i.orig -e "s@\\\$Fre.BSD\\\$@$id@" $f ; - fi ; + fi ; done |
