From 5221e81cc5f195b32758617409cdc39e12277b82 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 17 Feb 2002 17:52:47 +0000 Subject: r510: * Thanks to Benjamin Drieu , dh_installdocs -X now works. I had to modify his patch to use cp --parents, since -P spews warnings now. Also, I made it continue to use cp -a if nothing is excluded, which is both faster, and means this patch is less likely to break anything if it turns out to be buggy. Also, stylistic changes. Closes: #40649 * Implemented -X for dh_installexamples as well. * dh_clean -X substvars will also work now. Closes: #66890 --- dh_installexamples | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'dh_installexamples') diff --git a/dh_installexamples b/dh_installexamples index fae33012..f53dbc97 100755 --- a/dh_installexamples +++ b/dh_installexamples @@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -B [S>] [B<-A>] [S>] +B [S>] [B<-A>] [B<-X>I] [S>] =head1 DESCRIPTION @@ -40,12 +40,17 @@ acted on. Install these files as examples into the first package acted on. (Or into all packages if -A is specified.) +=item B<-Xitem>, B<--exclude=item> + +Exclude files that contain "item" anywhere in their filename from +being installed. + =back =head1 NOTES Note that dh_installexamples will happily copy entire directory hierarchies -if you ask it to (it uses cp -a internally). If it is asked to install a +if you ask it to (similar to cp -a). If it is asked to install a directory, it will install the complete contents of the directory. =cut @@ -65,13 +70,30 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) { push @examples, @ARGV; } - + if (@examples) { if (! -d "$tmp/usr/share/doc/$package/examples") { doit("install","-d","$tmp/usr/share/doc/$package/examples"); } - doit("cp","-a",@examples,"$tmp/usr/share/doc/$package/examples"); + my $exclude = ''; + if ($dh{EXCLUDE_FIND}) { + $exclude = ' \( ! '.$dh{EXCLUDE_FIND}.' \)'; + } + + foreach my $example (@examples) { + next if excludefile($example); + if (-d $example && $exclude) { + my ($dir_basename) = basename($example); + # Pity there's no cp --exclude .. + my $pwd=`pwd`; + chomp $pwd; + complex_doit("cd $example/.. && find $dir_basename -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;"); + } + else { + doit("cp", "-a", $example, "$tmp/usr/share/doc/$package/examples"); + } + } } } -- cgit v1.2.3