Skip to content

Commit

Permalink
fix: fix incorrect rebuild target in install-app-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Apr 9, 2017
1 parent 0e246e6 commit 88e52ad
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions packages/electron-builder/src/cli/install-app-deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ async function main() {

const projectDir = process.cwd()
const config = (await loadConfig(projectDir)) || {}
const results = await BluebirdPromise.all<string | null>([
const muonVersion = config.muonVersion
const results = await BluebirdPromise.all<string>([
computeDefaultAppDirectory(projectDir, use(config.directories, it => it!.app)),
config.muonVersion == null ? null : getElectronVersion(config, projectDir),
muonVersion == null ? getElectronVersion(config, projectDir) : BluebirdPromise.resolve(muonVersion),
])

// if two package.json — force full install (user wants to install/update app deps in addition to dev)
await installOrRebuild(config, results[0]!, {version: (results[1] || config.muonVersion)!, useCustomDist: config.muonVersion == null}, args.platform, args.arch, results[0] !== projectDir)
await installOrRebuild(config, results[0], {version: results[1], useCustomDist: muonVersion == null}, args.platform, args.arch, results[0] !== projectDir)
}

main()
Expand Down

0 comments on commit 88e52ad

Please sign in to comment.