diff --git a/dist/index.js b/dist/index.js index af590123..d62841b7 100644 --- a/dist/index.js +++ b/dist/index.js @@ -732,17 +732,12 @@ async function addPhive(data) { case /7\.2/.test(data['php_version']): data['version'] = '0.14.5'; break; + case /^latest$/.test(data['version']): + data['version'] = await getLatestVersion(data); + break; } - if (data['version'] === 'latest') { - data['version'] = await getLatestVersion(data); - } - data['domain'] = [ - data['github'], - data['repository'], - 'releases/download', - data['version'] - ].join('/'); - data['url'] = await getPharUrl(data); + data['extension'] = '-' + data['version'] + data['extension']; + data['url'] = await getUrl(data); return await addArchive(data); } exports.addPhive = addPhive; diff --git a/src/tools.ts b/src/tools.ts index 5f5915ad..9ed495cd 100644 --- a/src/tools.ts +++ b/src/tools.ts @@ -327,17 +327,12 @@ export async function addPhive(data: RS): Promise { case /7\.2/.test(data['php_version']): data['version'] = '0.14.5'; break; + case /^latest$/.test(data['version']): + data['version'] = await getLatestVersion(data); + break; } - if (data['version'] === 'latest') { - data['version'] = await getLatestVersion(data); - } - data['domain'] = [ - data['github'], - data['repository'], - 'releases/download', - data['version'] - ].join('/'); - data['url'] = await getPharUrl(data); + data['extension'] = '-' + data['version'] + data['extension']; + data['url'] = await getUrl(data); return await addArchive(data); }