X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=_webi%2Fnormalize.js;h=07b08c76e910512e2b1a156c2f41a2da21084efb;hb=237b7dc9fc77fe66ae4089908af04a433b271cca;hp=06c1ceec81e5f6043008698722a53cee60e344c0;hpb=debcee7e199579466159d9e4fc3b0038ae5f0d20;p=webi-installers%2F.git diff --git a/_webi/normalize.js b/_webi/normalize.js index 06c1cee..07b08c7 100644 --- a/_webi/normalize.js +++ b/_webi/normalize.js @@ -80,10 +80,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 +102,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 +114,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);