Item13929: Handling of both FreeBSD and MacOS styles of GNU tar naming.

foswiki · Nov 11, 2016 · f525988 · f525988
1 parent 5adc0a8
commit f525988
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/core/lib/Foswiki/Configure/FileUtil.pm b/core/lib/Foswiki/Configure/FileUtil.pm
@@ -712,14 +712,19 @@ sub _getTar {
 
         # Trying to find gnutar in order to keep as much compatibility with
         # linux as we can.
-        my $gnutar = `which gnutar`;
-        if ( $? == 0 && $gnutar ) {
-            chomp $gnutar;
-            if ( _getTarFamily($gnutar) eq 'gnu' ) {
-                $tarCmd    = $gnutar;
-                $tarFamily = 'gnu';
-            }
+        my $gnutar;
+      TAR_UTIL:
+        foreach my $utilname (qw(gtar gnutar)) {
+            $gnutar = `which $utilname`;
+            if ( $? == 0 && $gnutar ) {
+                chomp $gnutar;
+                if ( _getTarFamily($gnutar) eq 'gnu' ) {
+                    $tarCmd    = $gnutar;
+                    $tarFamily = 'gnu';
+                    last TAR_UTIL;
+                }
 
+            }
         }
 
     }