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

Timestamp:

Oct 8, 2007, 11:51:27 PM (17 years ago)

Author:

Bruno Cornec

Message:

Lots of SuSE fixes

File:

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

devel/pb/bin/pb

@@ -333 +333 @@
 
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        # Suse < 10.2 forces tar.bz2 usage :-(
+        if ($ddir eq "suse") {
+            my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
+            system "gzip -cd $src | bzip2 -c6 > $newsrc";
+            $src = $newsrc;
+        }
         print $LOG "Source file: $src\n" if ($debug >= 0);
 
@@ -343 +349 @@
             }
 
+            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             # We need to first extract the spec file
-            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             my @specfile;
             @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
@@ -742 +748 @@
 my @files;
 
-pb_system("tar xfpz $src $dir","Extracting build files");
+if ($src =~ /tar\.gz$/) {
+    pb_system("tar xfpz $src $dir","Extracting build files");
+} elsif ($src =~ /tar\.bz2$/) {
+    pb_system("tar xfpj $src $dir","Extracting build files");
+} else {
+    die "Unknown compression algorithm for $src";
+}
 opendir(DIR,"$dir") || die "Unable to open directory $dir";
 foreach my $f (readdir(DIR)) {