From 8cdbb969ffbf50e0f3a9a6f422bbc969d58a45aa Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 25 Apr 2022 21:39:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=BC=96=E8=AF=91=E6=89=80?= =?UTF-8?q?=E6=9C=89generic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron/build.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/electron/build.js b/electron/build.js index f30531ddb..c85a798ad 100644 --- a/electron/build.js +++ b/electron/build.js @@ -129,7 +129,7 @@ function startBuild(data, publish) { econfig.name = data.name; econfig.version = config.version; econfig.build.appId = data.id; - econfig.build.directories.output = `dist/${data.platform}`; + econfig.build.directories.output = `dist/${data.id}/${data.platform}`; econfig.build.artifactName = utils.getDomain(data.url) + "-v${version}-${os}-${arch}.${ext}"; econfig.build.nsis.artifactName = utils.getDomain(data.url) + "-v${version}-${os}-${arch}.${ext}"; if (!process.env.APPLEID || !process.env.APPLEIDPASS) { @@ -177,10 +177,14 @@ if (["dev"].includes(argv[2])) { let appChoices = []; config.app.forEach(data => { appChoices.push({ - name: data.name, + name: `${data.name} (${data.publish.provider})`, value: data }) }) + appChoices.push({ + name: "All generic", + value: 'generic' + }) const questions = [ { type: 'list', @@ -218,9 +222,16 @@ if (["dev"].includes(argv[2])) { ]; inquirer.prompt(questions).then(answers => { answers.platform.forEach(platform => { - let data = answers.app; - data.platform = platform - startBuild(data, answers.publish) + let array = []; + if (answers.app === 'generic') { + array = config.app.filter(({publish}) => publish.provider === 'generic') + } else { + array.push(answers.app) + } + array.forEach(data => { + data.platform = platform + startBuild(data, answers.publish) + }) }); }); }