X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;fp=lib%2FObject%2FRemote%2FFatNode.pm;h=c4071350eb64b43eac02f6f12c79a723e08c69e5;hb=bad3fec6a654f9c27497eb516dad0c5de5a720d6;hp=845c12b54055472a91449d91803a42516f587324;hpb=aed8cd59e460a6528c8eb4ce5c90fb50967778f4;p=scpubgit%2FObject-Remote.git diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm index 845c12b..c407135 100644 --- a/lib/Object/Remote/FatNode.pm +++ b/lib/Object/Remote/FatNode.pm @@ -40,17 +40,15 @@ chomp(my @inc = qx($command)); my %mods = reverse @inc; -my @non_core_non_arch = grep +( +my @non_core = grep +( not ( /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/ - or /^\Q$Config{vendorarchexp}/ or /^\Q$Config{sitearchexp}/ ) -), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods; +), keys %mods; my @core_non_arch = grep +( /^\Q$Config{privlibexp}/ - and not(/^\Q$Config{archlibexp}/ or /\Q$Config{archname}/ or /\Q$Config{myarchname}/) -), keys %mods; +), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods; my $start = stripspace <<'END_START'; # This chunk of stuff was generated by Object::Remote::FatNode. To find @@ -83,7 +81,7 @@ my $end = stripspace <<'END_END'; END_END my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }), - @non_core_non_arch, @core_non_arch; + @non_core, @core_non_arch; sub generate_fatpack_hash { my ($hash_name, $orig) = @_; @@ -95,7 +93,7 @@ sub generate_fatpack_hash { } my @segments = ( - map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core_non_arch), + map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core), map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch), );