Merge branch 'Release02x01'

foswiki · Nov 14, 2016 · 036f698 · 036f698
2 parents 682848b + 9a11a49
commit 036f698
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/PatternSkin/data/System/PatternSkinCssCookbook.txt b/PatternSkin/data/System/PatternSkinCssCookbook.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1426813108" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1479139667" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! %SYSTEMWEB%.PatternSkin CSS Cookbook
 
@@ -70,9 +70,6 @@ This is the complete style definition to set the height of the top bar:
 
 <verbatim class='css'>
 #patternTopBar,
-#patternClearHeaderCenter,
-#patternClearHeaderLeft,
-#patternClearHeaderRight,
 #patternTopBarContents {
 	height:75px; /* top bar height; make room for header columns */
 	overflow:hidden;

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;
+                }
 
+            }
         }
 
     }