Make all the return statements closer to the final calcuation of the

[perl5.git] / installperl

diff --git a/installperl b/installperl
index 5ba613a..ddf739d 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -804,19 +804,22 @@ sub installlib {
     return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$} ||
              $dir  =~ m{/t(?:/|$)};
     # ignore the cpan script in lib/CPAN/bin, the instmodsh and xsubpp
-    # scripts in lib/ExtUtils, and the prove script in lib/Test/Harness
-    # as well as the corelist script from lib/Module/CoreList/bin
+    # scripts in lib/ExtUtils, the prove script in lib/Test/Harness,
+    # the corelist script from lib/Module/CoreList/bin and ptar in
+    # lib/Archive/Tar/bin
     # (they're installed later with other utils)
-    return if $name =~ /^(?:cpan|instmodsh|prove|corelist)\z/;
+    return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar)\z/;
     # ignore the Makefiles
     return if $name =~ /^makefile$/i;
     # ignore the test extensions
     return if $dir =~ m{ext/XS/(?:APItest|Typemap)/};
+    # ignore the demo files
+    return if $dir =~ /\bdemos?\b/;
 
     # ignore READMEs, MANIFESTs, INSTALL docs, META.ymls and change logs.
     # Changes.e2x and README.e2x are needed by enc2xs.
     return if $name =~ m{^(?:README|MANIFEST|META\.yml|INSTALL)$};
-    return if $name =~ m{^(?:TODO|BUGS|CREDITS))$}i;
+    return if $name =~ m{^(?:TODO|BUGS|CREDITS)$}i;
     return if $name =~ m{^change(?:s|log)(?:\.libnet)?$}i;
 
     $name = "$dir/$name" if $dir ne '';