projects
/
webi-installers
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add xz
[webi-installers/.git]
/
_webi
/
normalize.js
diff --git
a/_webi/normalize.js
b/_webi/normalize.js
index 8e157abd0e23d0da9f5524e59f5975229b8a411b..07b08c76e910512e2b1a156c2f41a2da21084efb 100644
(file)
--- a/
_webi/normalize.js
+++ b/
_webi/normalize.js
@@
-39,9
+39,9
@@
var arches = [
];
var archMap = {
//amd64: /(amd.?64|x64|[_\-]64)/i,
];
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: /(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|_)((aarch|arm)64|arm)/i,
ppc64le: /(\b|_)(ppc64le)/i,
ppc64: /(\b|_)(ppc64)(\b|_)/i,
arm64: /(\b|_)((aarch|arm)64|arm)/i,
@@
-80,10
+80,16
@@
function normalize(all) {
rel.arch = arch;
return true;
}
rel.arch = arch;
return true;
}
- })[0];
+ });
+ }
+ if (!rel.arch) {
+ if ('macos' === rel.os) {
+ rel.arch = 'amd64';
+ }
}
supported.arches[rel.arch] = true;
}
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']
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('.');
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';
} else if ('tgz' == exts[0]) {
rel.ext = 'tar.gz';
+ tarExt = 'tar';
} else {
rel.ext = exts[0];
}
} else {
rel.ext = exts[0];
}
@@
-106,7
+114,7
@@
function normalize(all) {
rel.ext = 'exe';
}
}
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);
if (all.download) {
rel.download = all.download.replace(/{{ download }}/, rel.download);