From: Tyler Riddle <t.riddle@shadowcat.co.uk>
Date: Mon, 8 Oct 2012 22:02:18 +0000 (-0700)
Subject: remove IO::Prompter from Makefile.PL; allow Fatnode to ship arch files
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d1f5ad7b7c7e1f147b43de418e2861a2bc8acf74;p=scpubgit%2FObject-Remote.git

remove IO::Prompter from Makefile.PL; allow Fatnode to ship arch files
---

diff --git a/Makefile.PL b/Makefile.PL
index 197ad7c..6ee313e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,9 +7,6 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
   NAME => 'Object::Remote',
   VERSION_FROM => 'lib/Object/Remote.pm',
-  BUILD_REQUIRES => {
-     'IO::Prompter' => 0, 	
-  },
   PREREQ_PM => {
     Moo => 0,
     'Module::Runtime' => 0,
diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index bab58d5..7ceb59d 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -40,17 +40,14 @@ chomp(my @inc = qx($command));
 
 my %mods = reverse @inc;
 
-#TODO oi this isn't right yet
-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}/
   )
 ), keys %mods;
 
-my @core_non_arch = grep +(
+my @core = grep +(
   /^\Q$Config{privlibexp}/
-  and not(/^\Q$Config{archlibexp}/ or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
 ), keys %mods;
 
 my $env_pass = '';
@@ -91,7 +88,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;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
@@ -103,8 +100,8 @@ sub generate_fatpack_hash {
 }
 
 my @segments = (
-    map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core_non_arch),
-    map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
+    map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core),
+    map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core),
 );
 
 our $DATA = join "\n", $start, $env_pass, @segments, $end;