X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=_webi%2Fnormalize.js;h=1c247f7b71e890a6905466bcfe8a8c77c041ee88;hb=91512157ab426c87e0a82b594620e90e324b23a3;hp=3003bb9f62de851deebfcecd950ae3c4ef72d207;hpb=84965a2207ca49c6e9413749930c6a73d6546088;p=webi-installers%2F.git

diff --git a/_webi/normalize.js b/_webi/normalize.js
index 3003bb9..1c247f7 100644
--- a/_webi/normalize.js
+++ b/_webi/normalize.js
@@ -39,14 +39,15 @@ var arches = [
 ];
 var archMap = {
   //amd64: /(amd.?64|x64|[_\-]64)/i,
-  amd64: /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)64(\b|_)/i,
+  amd64:
+    /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)64([_\-]?bit)?(\b|_)/i,
   //x86: /(86)(\b|_)/i,
-  x86: /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)(86|32)(\b|_)/i,
+  x86: /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)(86|32)([_\-]?bit)(\b|_)/i,
   ppc64le: /(\b|_)(ppc64le)/i,
   ppc64: /(\b|_)(ppc64)(\b|_)/i,
-  arm64: /(\b|_)(arm64|arm)/i,
+  arm64: /(\b|_)((aarch|arm)64|arm)/i,
   armv7l: /(\b|_)(armv?7l)/i,
-  armv6l: /(\b|_)(armv?6l)/i,
+  armv6l: /(\b|_)(aarch32|armv?6l)/i,
   s390x: /(\b|_)(s390x)/i
 };
 arches.forEach(function (name) {
@@ -80,10 +81,16 @@ function normalize(all) {
           rel.arch = arch;
           return true;
         }
-      })[0];
+      });
+    }
+    if (!rel.arch) {
+      if ('macos' === rel.os) {
+        rel.arch = 'amd64';
+      }
     }
     supported.arches[rel.arch] = true;
 
+    var tarExt;
     if (!rel.ext) {
       // pkg-v1.0.tar.gz => ['gz', 'tar', '0', 'pkg-v1']
       // pkg-v1.0.tar => ['tar', '0' ,'pkg-v1']
@@ -96,8 +103,10 @@ function normalize(all) {
       exts = exts.reverse().slice(0, 2);
       if ('tar' === exts[1]) {
         rel.ext = exts.reverse().join('.');
+        tarExt = 'tar';
       } else if ('tgz' == exts[0]) {
         rel.ext = 'tar.gz';
+        tarExt = 'tar';
       } else {
         rel.ext = exts[0];
       }
@@ -106,7 +115,7 @@ function normalize(all) {
         rel.ext = 'exe';
       }
     }
-    supported.formats[rel.ext] = true;
+    supported.formats[tarExt || rel.ext] = true;
 
     if (all.download) {
       rel.download = all.download.replace(/{{ download }}/, rel.download);
@@ -127,6 +136,15 @@ function normalize(all) {
 }
 
 module.exports = normalize;
+module.exports._debug = function (all) {
+  all = normalize(all);
+  all.releases = all.releases
+    .filter(function (r) {
+      return ['windows', 'macos', 'linux'].includes(r.os) && 'amd64' === r.arch;
+    })
+    .slice(0, 10);
+  return all;
+};
 // NOT in order of priority (which would be tar, xz, zip, ...)
 module.exports.formats = formats;
 module.exports.arches = arches;