summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2016-01-19 14:25:22 +0000
committerdes <des@FreeBSD.org>2016-01-19 14:25:22 +0000
commit23cbd2460dd7d0438e97d67eb18a0bd5acf7ea9c (patch)
treeafc63a041d9230f4905882f0f91a916fc7d9a4d0
parent1fb8b3ddb1320a70824772338554ff86bc1aef17 (diff)
downloadFreeBSD-src-23cbd2460dd7d0438e97d67eb18a0bd5acf7ea9c.zip
FreeBSD-src-23cbd2460dd7d0438e97d67eb18a0bd5acf7ea9c.tar.gz
Use 'svn list -R' instead of find, and recognize comments in shell scripts
and {ssh,sshd}_config.
-rwxr-xr-xcrypto/openssh/freebsd-pre-merge.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/freebsd-pre-merge.sh b/crypto/openssh/freebsd-pre-merge.sh
index 676cabf..473474c 100755
--- a/crypto/openssh/freebsd-pre-merge.sh
+++ b/crypto/openssh/freebsd-pre-merge.sh
@@ -5,10 +5,10 @@
:>keywords
:>rcsid
-find . -type f -name '*.[1-9ch]' | cut -c 3- | \
+svn list -R | grep -v '/$' | \
while read f ; do
svn proplist -v $f | grep -q 'FreeBSD=%H' || continue
- egrep -l '(\.\\"|/\*) \$FreeBSD[:\$]' $f >>keywords
+ egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords
egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid
done
sort -u keywords rcsid | xargs perl -n -i -e '
OpenPOWER on IntegriCloud