aarch64 bugfix and minor formatting updates

[webi-installers/.git] / _webi / normalize.js

diff --git a/_webi/normalize.js b/_webi/normalize.js
index 3003bb9f62de851deebfcecd950ae3c4ef72d207..0e06bcba72f12f9e9143a32a6f0a3b98e8dd74c9 100644 (file)
--- a/_webi/normalize.js
+++ b/_webi/normalize.js
@@ -39,14 +39,14 @@ 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) {
@@ -84,6 +84,7 @@ function normalize(all) {
     }
     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 +97,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 +109,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);