--- rock-old/scripts/Internal Wed Sep 26 06:37:43 2001 +++ rock-new/scripts/Internal Sat Sep 29 13:56:58 2001 @@ -138,12 +138,21 @@ tr -s \\t | tr : \\t | cut -f1,3 | sed 's,^ext-config/INDEX.,,' ; } | \ perl -e 'while (<>) { @_=split; $x{$_[1]}.="\t".$_[0]; } foreach (sort keys %x) { print "$_$x{$_}\n" if $x{$_}=~/.\t/; }' -elif [ "$1" = "diff" -a "$#" = "3" ] ; then +# elif [ "$1" = "diff" -a "$#" = "3" ] ; then +elif [ "$1" = "diff" -a "$#" -gt 2 ] ; then + # ---- Check for '-base' parameter - if added only a diff is + # run on the base distribution files (no ext packages): + # + # ./scripts/Internal diff -base ../rock-src-1.5.12-ORIG/ . + # + if [ "$2" != "-base" ] ; then baseonly=1 ; diffdirs="arch-conf ext-config" + else shift ; fi if ! perl -e 'exit 0' ; then perl() { cat ; } fi - for x in Documentation ext-config misc pkg-config \ - arch-conf scripts subdists ; do + # ---- Walk all directories and output diff + for x in Documentation $diffdirs misc pkg-config \ + scripts subdists ; do diff -ruN "$2"/$x/. "$3"/$x/. | grep -v '^diff ' | \ sed "s,^--- $2/$x/./,--- rock-old/$x/," | \ sed "s,^+++ $3/$x/./,+++ rock-new/$x/," | \ @@ -269,7 +278,7 @@ echo echo "This is an Internal Script. It is only needed by the core developers." echo - echo "Usage: ./scripts/Internal checkver | diff " + echo "Usage: ./scripts/Internal checkver | diff [ -base ] " x=" " echo "$x" "{ snapshot | devel-update } [ ] | getip" echo "$x" "make-cksum-cache | ext-checkdup | refetch-ext"