diff --git a/src/packager.ts b/src/packager.ts index 751ade574e8..5257253a38f 100644 --- a/src/packager.ts +++ b/src/packager.ts @@ -7,7 +7,7 @@ import { all, executeFinally } from "./util/promise" import { EventEmitter } from "events" import { Promise as BluebirdPromise } from "bluebird" import { AppMetadata, DevMetadata, Platform, Arch } from "./metadata" -import { PackagerOptions, PlatformPackager, BuildInfo, ArtifactCreated, Target } from "./platformPackager" +import { PlatformPackager, BuildInfo, ArtifactCreated, Target } from "./platformPackager" import { WinPackager } from "./winPackager" import * as errorMessages from "./errorMessages" import * as util from "util" @@ -19,6 +19,7 @@ import MacPackager from "./macPackager" import { createTargets } from "./targets/targetFactory" import { readPackageJson } from "./util/readPackageJson" import { TmpDir } from "./util/tmp" +import { BuildOptions } from "./builder" //noinspection JSUnusedLocalSymbols const __awaiter = require("./util/awaiter") @@ -45,7 +46,7 @@ export class Packager implements BuildInfo { readonly tempDirManager = new TmpDir() //noinspection JSUnusedGlobalSymbols - constructor(public options: PackagerOptions) { + constructor(public options: BuildOptions) { this.projectDir = options.projectDir == null ? process.cwd() : path.resolve(options.projectDir) } diff --git a/src/platformPackager.ts b/src/platformPackager.ts index 42e39d361b3..39331143d69 100644 --- a/src/platformPackager.ts +++ b/src/platformPackager.ts @@ -15,6 +15,7 @@ import { copyFiltered, devDependencies } from "./util/filter" import { ElectronPackagerOptions, pack } from "./packager/dirPackager" import { TmpDir } from "./util/tmp" import { FileMatchOptions, FileMatcher, FilePattern, deprecatedUserIgnoreFilter } from "./fileMatcher" +import { BuildOptions } from "./builder" //noinspection JSUnusedLocalSymbols const __awaiter = require("./util/awaiter") @@ -52,7 +53,7 @@ export interface PackagerOptions { } export interface BuildInfo { - options: PackagerOptions + options: BuildOptions devMetadata: DevMetadata diff --git a/src/targets/squirrelWindows.ts b/src/targets/squirrelWindows.ts index ce2a24f05f8..3430cbd7c0d 100644 --- a/src/targets/squirrelWindows.ts +++ b/src/targets/squirrelWindows.ts @@ -77,6 +77,10 @@ export default class SquirrelWindowsTarget extends Target { vendorPath: await getBinFromBintray("Squirrel.Windows", SW_VERSION, SW_SHA2) }, packager.platformSpecificBuildOptions) + if (options.remoteToken == null) { + options.remoteToken = packager.info.options.githubToken + } + if (!("loadingGif" in options)) { const resourceList = await packager.resourceList if (resourceList.includes("install-spinner.gif")) {