handle GNU tar named gnutar, and improve diagnostic messages

[p5sagit/Distar.git] / lib / Distar.pm

diff --git a/lib/Distar.pm b/lib/Distar.pm
index a3197e8..2efc6d2 100644 (file)
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -142,13 +142,13 @@ sub write_manifest_skip {
     my $tar = $self->{TAR};
     my $gtar;
     my $set_user;
-    my $version = `$tar --version 2>$dn`;
-    if ($version =~ /GNU tar/) {
-      $gtar = 1;
-    }
-    elsif (!$pre_tar && `gtar --version 2>$dn`) {
-      $tar = 'gtar';
-      $gtar = 1;
+    for my $maybe_tar ($tar, qw(gtar gnutar)) {
+      my $version = `$maybe_tar --version 2>$dn`;
+      if ($version =~ /GNU tar/) {
+        $tar = $maybe_tar;
+        $gtar = 1;
+        last;
+      }
     }
     my $tarflags = $self->{TARFLAGS};
     if (my ($flags) = $tarflags =~ /^-?([cvhlLf]+)$/) {
@@ -170,8 +170,23 @@ sub write_manifest_skip {
         $warn .= ($warn ? ' and ' : '').'gid('.(0+$)).')';
       }
       if ($warn) {
-        warn "$warn too large!  Max is ".(2**21-1).".\n"
-          ."Dist creation will likely fail.  Install GNU tar to work around.\n";
+        warn "Current $warn too large to create portable dist archives!  Max is ".(2**21-1).".\n"
+          ."Dist creation will most likely fail.  Install GNU tar and re-run Makefile.PL to fix this issue.\n";
+        my @try;
+        my $brew = `which brew 2>$dn`;
+        chomp $brew;
+        if (-x $brew) {
+          push @try, 'brew install gnu-tar';
+        }
+        my $ports = `which ports 2>$dn`;
+        chomp $ports;
+        if (-x $ports) {
+          push @try, 'sudo ports install gnutar';
+        }
+        if (@try) {
+          warn "Try" . (@try > 1 ? ' one of' : '') . ":\n"
+            . join '', map "    $_\n", @try;
+        }
       }
     }
 
@@ -248,6 +263,8 @@ check-cpan-upload:
        $(NOECHO) cpan-upload -h $(DEV_NULL_STDOUT)
 releasetest:
        $(MAKE) disttest RELEASE_TESTING=1 DISTTEST_MAKEFILE_PARAMS="PREREQ_FATAL=1" PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\""
+       $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(ECHO) "Failed to generate $(DISTVNAME)/LICENSE!" >&2
+       $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE
 release: preflight
        $(MAKE) releasetest
        $(GET_CHANGELOG) -p"Release commit for $(VERSION)" | git commit -a -F -
@@ -269,10 +286,10 @@ $(DISTVNAME)/README: $(VERSION_FROM)
        $(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) README
 distsignature: readmefile licensefile
 licensefile: create_distdir
-       $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE
+       $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE || $(TRUE)
 $(DISTVNAME)/LICENSE: Makefile.PL
        $(NOECHO) $(MKPATH) $(DISTVNAME)
-       $(ABSPERLRUN) $(HELPERS)/generate-license $(AUTHORS) $(LICENSES) >$(DISTVNAME)/LICENSE
+       $(ABSPERLRUN) $(HELPERS)/generate-license -o $(DISTVNAME)/LICENSE $(AUTHORS) $(LICENSES)
        $(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) LICENSE
 disttest: distmanicheck
 distmanicheck: create_distdir