X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;h=fe07f29f94d46dacb51bfe2e13075925291a2fa0;hp=819d657b1e80d75cc5d35c3fb34174d0ff4ba051;hb=dd6e1327e96d5488e34f7519d9d3290627c9bbe8;hpb=5e850e3ea90044b25ffacd71483a8edd326af21d

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 819d657..fe07f29 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -5,7 +5,7 @@ use Config;
 use B qw(perlstring);
 
 my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
-#used by t/watchdog_fatnode 
+#used by t/watchdog_fatnode
 our $INHIBIT_RUN_NODE = 0;
 
 sub stripspace {
@@ -17,15 +17,18 @@ sub stripspace {
 my %maybe_libs = map +($_ => 1), grep defined, (values %Config, '.');
 
 my @extra_libs = grep not(ref($_) or $maybe_libs{$_}), @INC;
-
-my $extra_libs = join '', map "  -I$_\n", @extra_libs;
+my $extra_libs = join '', map {
+    my $lib = $_;
+    $lib =~ s{'}{'\\''}g;
+    "  -I'$lib'\n";
+} @extra_libs;
 
 my $command = qq(
   $^X
   $extra_libs
   -mObject::Remote
   -mObject::Remote::Connector::STDIO
-  -mCPS::Future
+  -mFuture
   -mMRO::Compat
   -mClass::C3
   -mClass::C3::next
@@ -34,6 +37,7 @@ my $command = qq(
   -mObject::Remote::Node
   -mMethod::Generate::BuildAll
   -mMethod::Generate::DemolishAll
+  -mMoo::HandleMoose::_TypeMap
   -mJSON::PP
   -e 'print join "\\n", \%INC'
 );
@@ -42,7 +46,7 @@ $command =~ s/\n/ /g;
 
 chomp(my @inc = qx($command));
 
-my %exclude = map { $_ => 1 } @exclude_mods; 
+my %exclude = map { $_ => 1 } @exclude_mods;
 my %mods = reverse @inc;
 my %file_names = @inc;