Changeset 2637 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Aug 19, 2020, 2:10:44 AM (4 years ago)

Author:

Bruno Cornec

Message:

More tar extensions fixes

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -1583 +1583 @@
             move("$preserve","$pbpkg-$pbver$pbextdir.$ext");
         } else {
-                $ext = "tar.gz";
+            $ext = "tar.gz";
             # Possibility to look at PBSRC to guess more the filename
             pb_system("tar cfz $pbpkg-$pbver$pbextdir.$ext --exclude=$pbpkg-$pbver$pbextdir/pbconf $pbpkg-$pbver$pbextdir","Creating $pbpkg tar files compressed");
@@ -1836 +1836 @@
 
         } elsif ($pbos->{'type'} eq "deb") {
-            pb_system("tar xfz $src","Extracting sources");
+            pb_system("tar xf $src","Extracting sources");
             pb_system("tar xfz $src2","Extracting pbconf");
 
@@ -2048 +2048 @@
             $made="$made $pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
 
-            pb_system("tar xfz $src","Extracting sources");
+            pb_system("tar xf $src","Extracting sources");
             pb_system("tar xfz $src2","Extracting pbconf");
             chdir "$pbpkg-$pbver$pbextdir" || confess "Unable to chdir to $pbpkg-$pbver$pbextdir";
@@ -2066 +2066 @@
             pb_mkdir_p("$pbos->{'type'}");
             pb_mkdir_p("$pkgdestdir/pbdelivery");
-            pb_system("tar xfz $src","Extracting sources under $ENV{'PBBUILDDIR'}");
+            pb_system("tar xf $src","Extracting sources under $ENV{'PBBUILDDIR'}");
             pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}");
             # We need to handle potential patches to upstream sources
@@ -5131 +5131 @@
 my $res;
 
-if ($src =~ /tar\.gz$/) {
+if (($src =~ /tar\.gz$/) || ($src =~ /tgz$/)) {
     $res = pb_system("tar xfpz $src $dir","Extracting $mandatory files from $src",$flag);
 } elsif ($src =~ /tar\.bz2$/) {
     $res = pb_system("tar xfpj $src $dir","Extracting $mandatory files from $src",$flag);
+} elsif ($src =~ /tar\.xz$/) {
+    $res = pb_system("tar xfpJ $src $dir","Extracting $mandatory files from $src",$flag);
 } else {
     confess "Unknown compression algorithm for $src";