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

diff --git a/script/bootstrap.pl b/script/bootstrap.pl
index 3ee6ed2..1c302ce 100644
--- a/script/bootstrap.pl
+++ b/script/bootstrap.pl
@@ -44,19 +44,10 @@ lib->import("$target/lib/perl5");
 # can't access
 
 local %CPAN::Config;
-require CPAN::HandleConfig;w
+require CPAN::HandleConfig;
 CPAN::HandleConfig->load();
 $CPAN::Config->{prefs_dir} = "~/.cpan/prefs";
 
-# First just force install local::lib to get it local to $target
-force(qw/install LWP::UserAgent/); # Need LWP for CPAN to work on Mac, as curl and
-                           # wget puke on the spaces in
-                           # ~/Library/Applicaton Support
-                           # Note - this needs to happen before File::HomeDir
-# Need to force File::HomeDir on the Mac
-if ($^O eq "darwin") {
-    force(qw/install Mac::Carbon/);
-}
 force(qw/install local::lib/);
 
 require local::lib; # Turn local::lib on
@@ -81,27 +72,5 @@ install('YAML');
 install('CPAN');
 install('Module::Install::Catalyst');
 
-# setup distroprefs
-{
-    # Ok, god only knows what version of CPAN we started with, so lets nuke the
-    # config and try to reload it here for safety
-    local %CPAN::Config;
-    require CPAN::HandleConfig; # not installed till we installed CPAN (5.8.x)
-    CPAN::HandleConfig->load();
-    mkdir $CPAN::Config->{prefs_dir} unless -d $CPAN::Config->{prefs_dir};
-    open(my $prefs, ">", File::Spec->catfile($CPAN::Config->{prefs_dir},
-        "catalyst_local-lib-disable-mech-live.yml")) or die "Can't open prefs_dir: $!";
-
-    print $prefs qq{---
-comment: "WWW-Mechanize regularly fails its live tests, turn them off."
-match:
-  distribution: "^PETDANCE/WWW-Mechanize-1.\\d+\\.tar\\.gz"
-patches:
-  - "BOBTFISH/WWW-Mechanize-1.XX-BOBTFISH-01_notests.patch.gz"
-};
-
-    close($prefs);
-}
-
 print "local::lib setup, type perl Makefile.PL && make installdeps to install dependencies";