Fix use of local dzil

nunorc · nunorc · commit b29f81cf6ee8 · 2015-12-22T12:29:50.000Z
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@
 
     * Create p5stack directory if missing (Issue#2, reported by AMBS++).
     * Attempt to warn about cpanm misses (Issue#3, reported by AMBS++).
+    * Fix use of local dzil
 
 0.003     2015-11-19 22:29:12+00:00 Europe/Lisbon
 
diff --git a/lib/App/p5stack.pm b/lib/App/p5stack.pm
@@ -111,15 +111,24 @@ sub _do_setup {
   my $cpanm = $self->_get_cpanm;
 
   if ($self->{deps} eq 'dzil') {
-    my $dzil = which 'dzil';
-    $self->_do_cpanm("Dist::Zilla") unless $dzil;
 
     unless (-e catfile($self->{home},'dist.ini')) {
       _log('Configuration is set to use "dzil" to gather dependencies information, but no "dist.ini" file was found in current directory.. exiting.');
       exit;
     }
-    system "$dzil listdeps | $cpanm --no-sudo -l $self->{local_lib}";
-    $self->{cpanm_flag} = $? >> 8;
+
+    my $dzil = which 'dzil';
+    if ($dzil) {
+      system "$dzil listdeps | $cpanm --no-sudo -l $self->{local_lib}";
+      $self->{cpanm_flag} = $? >> 8;
+    }
+    else {
+      $self->_do_cpanm("Dist::Zilla");
+      my $bin = catfile($self->{local_bin}, 'dzil');
+      my @env = ("PERL5LIB=$self->{Ilib}", "PATH=$self->{local_bin}:\$PATH");
+      system join(' ', @env, "$bin listdeps | $cpanm --no-sudo -l $self->{local_lib}");
+      $self->{cpanm_flag} = $? >> 8;
+     }
   }
   if ($self->{deps} eq 'cpanfile') {
     unless (-e catfile($self->{home},'cpanfile')) {
