diff options
| author | Dave Rolsky <autarch@urth.org> | 2001-11-19 12:17:09 -0600 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-11-25 19:46:55 +0000 |
| commit | 5de3f0dafce89a8a66760745213b4c2a7a75c731 (patch) | |
| tree | c44fbd83c3fd085179ecc0b0dc092657a58bd05f /lib/CPAN | |
| parent | c95f170b203f0b24696b298b0782f4f4c204d444 (diff) | |
| download | perl-5de3f0dafce89a8a66760745213b4c2a7a75c731.tar.gz | |
Further replacement of EU::MM with File::Spec
Message-ID: <Pine.LNX.4.40.0111191750440.22189-100000@urth.org>
p4raw-id: //depot/perl@13269
Diffstat (limited to 'lib/CPAN')
| -rw-r--r-- | lib/CPAN/FirstTime.pm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm index c1c98ed288..4eb5fc5640 100644 --- a/lib/CPAN/FirstTime.pm +++ b/lib/CPAN/FirstTime.pm @@ -16,6 +16,7 @@ use ExtUtils::MakeMaker qw(prompt); use FileHandle (); use File::Basename (); use File::Path (); +use File::Spec; use vars qw($VERSION); $VERSION = substr q$Revision: 1.54 $, 10; @@ -97,7 +98,7 @@ This may be a site-wide directory or a personal directory. }; - my $cpan_home = $CPAN::Config->{cpan_home} || MM->catdir($ENV{HOME}, ".cpan"); + my $cpan_home = $CPAN::Config->{cpan_home} || File::Spec->catdir($ENV{HOME}, ".cpan"); if (-d $cpan_home) { print qq{ @@ -140,8 +141,8 @@ next question. }; - $CPAN::Config->{keep_source_where} = MM->catdir($CPAN::Config->{cpan_home},"sources"); - $CPAN::Config->{build_dir} = MM->catdir($CPAN::Config->{cpan_home},"build"); + $CPAN::Config->{keep_source_where} = File::Spec->catdir($CPAN::Config->{cpan_home},"sources"); + $CPAN::Config->{build_dir} = File::Spec->catdir($CPAN::Config->{cpan_home},"build"); # # Cache size, Index expire @@ -268,7 +269,7 @@ by ENTER. my $path = $CPAN::Config->{$progname} || $Config::Config{$progname} || ""; - if (MM->file_name_is_absolute($path)) { + if (File::Spec->file_name_is_absolute($path)) { # testing existence is not good enough, some have these exe # extensions @@ -295,7 +296,7 @@ by ENTER. $ans = prompt("What is your favorite pager program?",$path); $CPAN::Config->{'pager'} = $ans; $path = $CPAN::Config->{'shell'}; - if (MM->file_name_is_absolute($path)) { + if (File::Spec->file_name_is_absolute($path)) { warn "Warning: configured $path does not exist\n" unless -e $path; $path = ""; } @@ -451,7 +452,7 @@ you don\'t know a WAIT server near you, just press ENTER. sub conf_sites { my $m = 'MIRRORED.BY'; - my $mby = MM->catfile($CPAN::Config->{keep_source_where},$m); + my $mby = File::Spec->catfile($CPAN::Config->{keep_source_where},$m); File::Path::mkpath(File::Basename::dirname($mby)); if (-f $mby && -f $m && -M $m < -M $mby) { require File::Copy; @@ -507,7 +508,7 @@ sub find_exe { my($dir); #warn "in find_exe exe[$exe] path[@$path]"; for $dir (@$path) { - my $abs = MM->catfile($dir,$exe); + my $abs = File::Spec->catfile($dir,$exe); if (($abs = MM->maybe_command($abs))) { return $abs; } |