diff --git a/distrib/sets/checkflist b/distrib/sets/checkflist index c9ac91882b63..3cf7ce71780c 100755 --- a/distrib/sets/checkflist +++ b/distrib/sets/checkflist @@ -1,6 +1,6 @@ #! /bin/sh -- # -# $NetBSD: checkflist,v 1.9 1998/07/04 09:27:18 ross Exp $ +# $NetBSD: checkflist,v 1.10 1998/07/22 17:01:43 perry Exp $ # # Verify output of makeflist against contents of $DESTDIR. @@ -11,17 +11,41 @@ origin=. tmpname=/tmp/_CHECK.$$ -if [ "$1" = "-x11" ]; then - sh makeflist -x > $tmpname - origin=./usr/X11R6 -elif [ "$1" = "-both" ]; then - sh makeflist -b > $tmpname -elif [ "$1" ]; then - echo Usage: checkflist [ -x11 -both ] - exit 1 -else - sh makeflist > $tmpname -fi + +xargs="" +dargs="" + +# handle args +while : ; do + case $1 in + -x11) + xargs="-x" + origin=./usr/X11R6 + ;; + -both) + xargs="-b" + ;; + -secr) + dargs="-d" + ;; + -*) + cat 1>&2 < $tmpname + ( cd $DESTDIR ; find $origin \( -type d -o -type f -o -type l \) ) | sort | \ diff $tmpname - /bin/rm -f $tmpname diff --git a/distrib/sets/makeflist b/distrib/sets/makeflist index 9a609323c0d5..b451d8f07e3d 100755 --- a/distrib/sets/makeflist +++ b/distrib/sets/makeflist @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: makeflist,v 1.9 1998/07/02 06:36:35 jonathan Exp $ +# $NetBSD: makeflist,v 1.10 1998/07/22 17:01:43 perry Exp $ # # Print out the files in some or all lists. # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...] @@ -17,6 +17,10 @@ lists=$nlists # handle args while : ; do case $1 in + -d*) + nlists="$nlists secr" + lists=$nlists + ;; -b*) lists="$xlists $nlists" ;; @@ -36,6 +40,7 @@ while : ; do cat 1>&2 <