Changeset 2637 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

More tar extensions fixes

Location:

devel

Files:

• pb-modules/Makefile.PL (modified) (1 diff)
• pb-modules/etc/api.yaml (modified) (2 diffs)
• pb-server/README (modified) (1 diff)
• pb/bin/pb (modified) (5 diffs)

devel/pb-modules/Makefile.PL

@@ -74 +74 @@
     $text .= "\t".'chmod 755 $(DESTDIR)'."$sharedir\n";
     $text .= "\t".'cp etc/pb.yml $(DESTDIR)'."$sharedir\n";
-    $text .= "\t".'cp etc/api.yml $(DESTDIR)'."$sharedir\n";
+    $text .= "\t".'cp etc/api.yaml $(DESTDIR)'."$sharedir\n";
 
     # Also create a fake version in /etc/pb for sysadmin to modify

devel/pb-modules/etc/api.yaml

@@ -1 +1 @@
 ---
-swagger: '2.0'
+# test with https://redocly.github.io/redoc/?url=http://trac.project-builder.org/browser/devel/pb-modules/etc/api.yaml?format=txt
+openapi: '3.0'
 info:
   title: Project-Builder.org
@@ -99 +100 @@
   '/conf/{prj}':
     get:
-      summary: List all configuration parameters for a specific project
+      # Use a YAML HEREDOC syntax
+      summary: |
+        List all configuration parameters 
+        for a specific project
       operationId: listConf
       tags:

devel/pb-server/README

@@ -8 +8 @@
 https://fr.slideshare.net/ssoriche/metacpan-mojolicious-and-openapi
 https://mojolicious.io/blog/2017/12/22/day-22-how-to-build-a-public-rest-api/
-
+https://github.com/metacpan/metacpan-api/blob/master/lib/MetaCPAN/API.pm

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";