X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=_webi%2Fnormalize.js;h=07b08c76e910512e2b1a156c2f41a2da21084efb;hb=0aa421a04287a0b423f3aa5d64682d0590bf1e18;hp=cd9c6246c3a73d98e01117fdd4a0c2ac9330946d;hpb=f9f280f724f8bad9eb00440c9dbb81d62a78ee01;p=webi-installers%2F.git

diff --git a/_webi/normalize.js b/_webi/normalize.js
index cd9c624..07b08c7 100644
--- a/_webi/normalize.js
+++ b/_webi/normalize.js
@@ -2,7 +2,7 @@
 
 // this may need customizations between packages
 var osMap = {
-  macos: /(\b|_)(apple|mac|darwin|iPhone|iOS|iPad)/i,
+  macos: /(\b|_)(apple|os(\s_-)?x\b|mac|darwin|iPhone|iOS|iPad)/i,
   linux: /(\b|_)(linux)/i,
   freebsd: /(\b|_)(freebsd)/i,
   windows: /(\b|_)(win|microsoft|msft)/i,
@@ -38,13 +38,15 @@ var arches = [
   's390x'
 ];
 var archMap = {
-  amd64: /(amd.?64|x64|[_\-]64)/i,
-  x86: /(86)(\b|_)/i,
+  //amd64: /(amd.?64|x64|[_\-]64)/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)([_\-]?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) {
@@ -78,25 +80,41 @@ 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']
       // pkg-v1.0.zip => ['zip', '0', 'pkg-v1']
-      var exts = (rel.name || rel.download).split('.').reverse().slice(0, 2);
-      var ext;
+      var exts = (rel.name || rel.download).split('.');
+      if (1 === exts.length) {
+        // for bare releases in the format of foo-linux-amd64
+        rel.ext = 'exe';
+      }
+      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];
       }
+      if (/\-|linux|mac|os[_\-]?x|arm|amd|86|64|mip/i.test(rel.ext)) {
+        // for bare releases in the format of foo.linux-amd64
+        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);