X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=_common%2Fnormalize.js;h=dac09020a7f4473ebfd917ecf3144bb3a0ac1791;hb=969df21e47c4d8312925638739a23eef0c349e1c;hp=6d17ee1ec83ff31ca42620d6fea5bb7c05225922;hpb=13f137fe8903b9e4ffcf892d3f134f55734d2155;p=webi-installers%2F.git

diff --git a/_common/normalize.js b/_common/normalize.js
index 6d17ee1..dac0902 100644
--- a/_common/normalize.js
+++ b/_common/normalize.js
@@ -2,11 +2,12 @@
 
 // this may need customizations between packages
 const osMap = {
-  macos: /\b(apple|mac|darwin|iPhone|iOS|iPad)/i,
-  linux: /\b(linux)/i,
-  windows: /\b(win|microsoft|msft)/i,
-  sunos: /\b(sun)/i,
-  aix: /\b(aix)/i
+  macos: /(\b|_)(apple|mac|darwin|iPhone|iOS|iPad)/i,
+  linux: /(\b|_)(linux)/i,
+  freebsd: /(\b|_)(freebsd)/i,
+  windows: /(\b|_)(win|microsoft|msft)/i,
+  sunos: /(\b|_)(sun)/i,
+  aix: /(\b|_)(aix)/i
 };
 
 // evaluation order matters
@@ -23,29 +24,41 @@ var archArr = [
 ];
 var archMap = {
   amd64: /(amd.?64|x64|[_\-]64)/i,
-  x86: /(86)\b/i,
-  ppc64le: /\b(ppc64le)/i,
-  ppc64: /\b(ppc64)\b/i,
-  arm64: /\b(arm64|arm)/i,
-  armv7l: /\b(armv?7l)/i,
-  armv6l: /\b(armv?6l)/i,
-  s390x: /\b(s390x)/i
+  x86: /(86)(\b|_)/i,
+  ppc64le: /(\b|_)(ppc64le)/i,
+  ppc64: /(\b|_)(ppc64)(\b|_)/i,
+  arm64: /(\b|_)(arm64|arm)/i,
+  armv7l: /(\b|_)(armv?7l)/i,
+  armv6l: /(\b|_)(armv?6l)/i,
+  s390x: /(\b|_)(s390x)/i
 };
 
 function normalize(all) {
   all.releases.forEach(function (rel) {
+    rel.version = rel.version.replace(/^v/i, '');
+    if (!rel.name) {
+      rel.name = rel.download.replace(/.*\//, '');
+    }
     if (!rel.os) {
       rel.os =
         Object.keys(osMap).find(function (regKey) {
-          //console.log('release os:', rel.download, regKey, osMap[regKey]);
-          return osMap[regKey].test(rel.download);
+          /* console.log(
+            'release os:',
+            regKey,
+            osMap[regKey],
+            osMap[regKey].test(rel.name || rel.download),
+            rel.name,
+            rel.download
+          );
+          // */
+          return osMap[regKey].test(rel.name || rel.download);
         }) || 'unknown';
     }
 
     if (!rel.arch) {
       archArr.some(function (regKey) {
         //console.log('release arch:', rel.download, regKey, archMap[regKey]);
-        var arch = rel.download.match(archMap[regKey]) && regKey;
+        var arch = (rel.name || rel.download).match(archMap[regKey]) && regKey;
         if (arch) {
           rel.arch = arch;
           return true;
@@ -57,7 +70,7 @@ function normalize(all) {
       // 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.download.split('.').reverse().slice(0, 2);
+      var exts = (rel.name || rel.download).split('.').reverse().slice(0, 2);
       var ext;
       if ('tar' === exts[1]) {
         rel.ext = exts.reverse().join('.');