fix failing tests: test machines contains /cp/ in path so 'copy' mode…

… is incorrectly assumed
perlancar · Jun 24, 2010 · 82b3713 · 82b3713
1 parent 189859d
commit 82b3713
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/bin/perlcp b/bin/perlcp
@@ -6,6 +6,8 @@ use FindBin '$Bin';
 use lib "$Bin/../lib";
 use App::perlmv;
 
-App::perlmv->new->run;
+my $pmv = App::perlmv->new;
+$pmv->{ 'mode' } = 'copy';
+$pmv->run;
 
 1;
diff --git a/bin/perlln b/bin/perlln
@@ -6,6 +6,8 @@ use FindBin '$Bin';
 use lib "$Bin/../lib";
 use App::perlmv;
 
-App::perlmv->new->run;
+my $pmv = App::perlmv->new;
+$pmv->{ 'mode' } = 'link';
+$pmv->run;
 
 1;
diff --git a/bin/perlln_s b/bin/perlln_s
@@ -6,6 +6,8 @@ use FindBin '$Bin';
 use lib "$Bin/../lib";
 use App::perlmv;
 
-App::perlmv->new->run;
+my $pmv = App::perlmv->new;
+$pmv->{ 'mode' } = 'symlink';
+$pmv->run;
 
 1;
diff --git a/bin/perlmv b/bin/perlmv
@@ -6,7 +6,9 @@ use FindBin '$Bin';
 use lib "$Bin/../lib";
 use App::perlmv;
 
-App::perlmv->new->run;
+my $pmv = App::perlmv->new;
+$pmv->{ 'mode' } = 'rename';
+$pmv->run;
 
 1;
 __END__

diff --git a/lib/App/perlmv.pm b/lib/App/perlmv.pm
@@ -51,9 +51,6 @@ sub new {
 
 sub parse_opts {
     my $self = shift;
-    # because some platforms don't support ln and ln -s. otherwise i
-    # would just link the 'perlmv' command to 'perlcp', 'perlln',
-    # perlln_s'.
 
     GetOptions(
         'c|check'         => \$self->{ 'check'         },
@@ -96,9 +93,9 @@ sub run {
 
     # -m is reserved for file mode
     my $default_mode =
-        $0 =~ /cp/   ? 'copy'    :
-        $0 =~ /ln_s/ ? 'symlink' :
-        $0 =~ /ln/   ? 'link'    :
+        $0 =~ /perlcp/   ? 'copy'    :
+        $0 =~ /perlln_s/ ? 'symlink' :
+        $0 =~ /perlln/   ? 'link'    :
         'rename';
 
     $self->{'dry_run'} and $self->{'verbose'}++;