From 57fe6648c448a9ad33eb42536f73797cc9ca4b10 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sun, 31 Dec 2023 01:00:37 +0000 Subject: [PATCH] fix(installer): return rather than error for self-hosted installers (no releases.js) --- _webi/serve-installer.js | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/_webi/serve-installer.js b/_webi/serve-installer.js index 4b35390..fb6b8bc 100644 --- a/_webi/serve-installer.js +++ b/_webi/serve-installer.js @@ -83,20 +83,6 @@ InstallerServer.helper = async function ({ projectName = proj.detail; } - let projInfo = await Builds.getPackage({ - name: projectName, - date: new Date(), - }); - //console.log('projInfo', projInfo); - - let buildTargetInfo = { - triplets: projInfo.triplets, - oses: projInfo.oses, - arches: projInfo.arches, - libcs: projInfo.libcs, - formats: projInfo.formats, - }; - let tmplParams = { pkg: projectName, tag: tag, @@ -106,8 +92,6 @@ InstallerServer.helper = async function ({ formats: hostFormats, limit: 1, }; - let latest = projInfo.versions[0]; - Object.assign(tmplParams, { latest }); Object.assign(tmplParams, releaseTarget); console.log('tmplParams', tmplParams); @@ -128,6 +112,26 @@ InstallerServer.helper = async function ({ "Check query parameters. Should be something like '/api/releases/{package}@{version}.tab?os={macos|linux|windows|-}&arch={amd64|x86|aarch64|arm64|armv7l|-}&libc={musl|gnu|msvc|libc|static}&limit=10'", }; + if (proj.type === 'selfhosted') { + return [errPackage, tmplParams]; + } + + let projInfo = await Builds.getPackage({ + name: projectName, + date: new Date(), + }); + let latest = projInfo.versions[0]; + Object.assign(tmplParams, { latest }); + //console.log('projInfo', projInfo); + + let buildTargetInfo = { + triplets: projInfo.triplets, + oses: projInfo.oses, + arches: projInfo.arches, + libcs: projInfo.libcs, + formats: projInfo.formats, + }; + let hasOs = projInfo.oses.includes(hostTarget.os); if (!hasOs) { let pkg1 = Object.assign(buildTargetInfo, errPackage);