fixed release_filter so that it doesn't put CVS files into the release

1 files changed, 10 insertions, 9 deletions

diff --git a/bin/make_release b/bin/make_release
index cb91cfdf2e5..051e66511a7 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -40,8 +40,8 @@ $kit = '';
 $release_type = 'beta';
 $controlled_files = '';
 $release_files = '';
-$release_filter = '-name CVS -prune -name build -prune -o ! -name \'.\#*\' ' .
-                  '! -name \'\#*\' ! -name \'*~\' ' .
+$release_filter = '\\( -name CVS -o -name build \\) -prune -o ' .
+                  '! -name \'.\#*\' ! -name \'\#*\' ! -name \'*~\' ' .
                   '! -name \'*.MAK\' -print';
 
 
@@ -61,30 +61,30 @@ while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
     $exec_prefix = 'echo \'';
     $exec_suffix = '\'';
   } elsif ($ARGV[0] eq '-t') {
-    if ( $ARGV[1] =~ /^[^-]+/  &&
-         ($ARGV[1] eq 'major' || $ARGV[1] eq 'minor' ||
-          $ARGV[1] eq 'beta')) {
+    if ($ARGV[1] =~ /^[^-]+/  &&
+        ($ARGV[1] eq 'major' || $ARGV[1] eq 'minor' ||
+         $ARGV[1] eq 'beta')) {
       $release_type = $ARGV[1]; shift;
     } else {
       print STDERR "$0:  must provide argument for -t option\n";
       die "$usage$long_usage";
     }
   } elsif ($ARGV[0] eq '-c') {
-    if ( $ARGV[1] =~ /^[^-]+/) {
+    if ($ARGV[1] =~ /^[^-]+/) {
       $controlled_files = $ARGV[1]; shift;
     } else {
       print STDERR "$0:  must provide argument for -c option\n";
       die "$usage$long_usage";
     }
   } elsif ($ARGV[0] eq '-r') {
-    if ( $ARGV[1] =~ /^[^-]+/) {
+    if ($ARGV[1] =~ /^[^-]+/) {
       $release_files = $ARGV[1]; shift;
     } else {
       print STDERR "$0:  must provide argument for -r option\n";
       die "$usage$long_usage";
     }
   } elsif ($ARGV[0] eq '-l') {
-    if ( $ARGV[1] =~ /^[^-]+/) {
+    if ($ARGV[1] =~ /^[^-]+/) {
       $release_lib_files = $ARGV[1]; shift;
     } else {
       print STDERR "$0:  must provide argument for -l option\n";
@@ -423,7 +423,8 @@ sub create_kit () {
   }
 
   # These files don't get LF->CRLF conversions done when making the zip.
-  $bin_files = "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.gz\|\\.zip\|\\.gif\"";
+  $bin_files =
+    "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.gz\|\\.zip\|\\.gif\"";
 
   if ($kit eq 'ace') {
     system ("$exec_prefix" .