- Timestamp:
- Aug 19, 2020, 2:10:44 AM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r2631 r2637 1583 1583 move("$preserve","$pbpkg-$pbver$pbextdir.$ext"); 1584 1584 } else { 1585 1585 $ext = "tar.gz"; 1586 1586 # Possibility to look at PBSRC to guess more the filename 1587 1587 pb_system("tar cfz $pbpkg-$pbver$pbextdir.$ext --exclude=$pbpkg-$pbver$pbextdir/pbconf $pbpkg-$pbver$pbextdir","Creating $pbpkg tar files compressed"); … … 1836 1836 1837 1837 } elsif ($pbos->{'type'} eq "deb") { 1838 pb_system("tar xf z$src","Extracting sources");1838 pb_system("tar xf $src","Extracting sources"); 1839 1839 pb_system("tar xfz $src2","Extracting pbconf"); 1840 1840 … … 2048 2048 $made="$made $pbpkg/$pbpkg-$pbver-*-$pbtag.tgz"; 2049 2049 2050 pb_system("tar xf z$src","Extracting sources");2050 pb_system("tar xf $src","Extracting sources"); 2051 2051 pb_system("tar xfz $src2","Extracting pbconf"); 2052 2052 chdir "$pbpkg-$pbver$pbextdir" || confess "Unable to chdir to $pbpkg-$pbver$pbextdir"; … … 2066 2066 pb_mkdir_p("$pbos->{'type'}"); 2067 2067 pb_mkdir_p("$pkgdestdir/pbdelivery"); 2068 pb_system("tar xf z$src","Extracting sources under $ENV{'PBBUILDDIR'}");2068 pb_system("tar xf $src","Extracting sources under $ENV{'PBBUILDDIR'}"); 2069 2069 pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}"); 2070 2070 # We need to handle potential patches to upstream sources … … 5131 5131 my $res; 5132 5132 5133 if ( $src =~ /tar\.gz$/) {5133 if (($src =~ /tar\.gz$/) || ($src =~ /tgz$/)) { 5134 5134 $res = pb_system("tar xfpz $src $dir","Extracting $mandatory files from $src",$flag); 5135 5135 } elsif ($src =~ /tar\.bz2$/) { 5136 5136 $res = pb_system("tar xfpj $src $dir","Extracting $mandatory files from $src",$flag); 5137 } elsif ($src =~ /tar\.xz$/) { 5138 $res = pb_system("tar xfpJ $src $dir","Extracting $mandatory files from $src",$flag); 5137 5139 } else { 5138 5140 confess "Unknown compression algorithm for $src";
Note:
See TracChangeset
for help on using the changeset viewer.