X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=script%2Fbootstrap.pl;h=c068563ccdefa1063a9967c16b3a01475fc550c7;hb=1ff94f744944764df3f541f7caf739180e90e17b;hp=1c302ce81137adc5913c81c0ed7446c359d8c8a5;hpb=bb20c9689d647686500806d19aa93dee07e795a2;p=catagits%2FGitalist.git

diff --git a/script/bootstrap.pl b/script/bootstrap.pl
index 1c302ce..c068563 100644
--- a/script/bootstrap.pl
+++ b/script/bootstrap.pl
@@ -46,11 +46,13 @@ lib->import("$target/lib/perl5");
 local %CPAN::Config;
 require CPAN::HandleConfig;
 CPAN::HandleConfig->load();
-$CPAN::Config->{prefs_dir} = "~/.cpan/prefs";
+$CPAN::Config->{prefs_dir} = "$ENV{HOME}/.cpan/prefs";
 
 force(qw/install local::lib/);
 
+require lib::core::only; # Turn lib::core:only on
 require local::lib; # Turn local::lib on
+lib::core::only->import();
 local::lib->import( $target );
 
 # Become fully self contained
@@ -60,7 +62,8 @@ $ENV{PERL5LIB} = ""; # If we used a local::lib to bootstrap, this kills it.
 $ENV{PERL_AUTOINSTALL_PREFER_CPAN}=1;
 $ENV{PERL_MM_OPT} .= " INSTALLMAN1DIR=none INSTALLMAN3DIR=none";
 
-local::lib->import( '--self-contained', $target );
+lib::core::only->import();
+local::lib->import( $target );
 
 # Force a re-install of local::lib here to get the dependencies for local::lib
 # It requires things which ensure we have an unfucked toolchain :)
@@ -70,7 +73,9 @@ force(qw/install local::lib/);
 install('Module::Install');
 install('YAML');
 install('CPAN');
+# For some reason this isn't installed along with M::I::Catalyst.
+install('File::Copy::Recursive');
 install('Module::Install::Catalyst');
 
-print "local::lib setup, type perl Makefile.PL && make installdeps to install dependencies";
+print "local::lib setup, type perl Makefile.PL && make installdeps to install dependencies\n";