From 361b3696d6453c7fe2b1adc9b3c485a581fec66f Mon Sep 17 00:00:00 2001 From: develar Date: Fri, 12 Aug 2016 20:52:37 +0200 Subject: [PATCH] fix: Do not trash old build artifacts Closes #586 --- src/targets/squirrelPack.ts | 7 ++++--- src/winPackager.ts | 1 - src/windowsCodeSign.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/targets/squirrelPack.ts b/src/targets/squirrelPack.ts index 4c8ac2beb66..ca800349735 100644 --- a/src/targets/squirrelPack.ts +++ b/src/targets/squirrelPack.ts @@ -1,6 +1,6 @@ import * as path from "path" import { Promise as BluebirdPromise } from "bluebird" -import { emptyDir, copy, createWriteStream, unlink } from "fs-extra-p" +import { remove, copy, createWriteStream, unlink, ensureDir } from "fs-extra-p" import { spawn, exec } from "../util/util" import { debug } from "../util/util" import { WinPackager } from "../winPackager" @@ -54,7 +54,8 @@ export async function buildInstaller(options: SquirrelOptions, outputDirectory: const promises = [ copy(path.join(options.vendorPath, "Update.exe"), appUpdate) .then(() => packager.sign(appUpdate)), - emptyDir(outputDirectory) + remove(outputDirectory.replace(/\\/g, "/") + "/*-full.nupkg") + .then(() => ensureDir(outputDirectory)) ] if (options.remoteReleases) { promises.push(syncReleases(outputDirectory, options)) @@ -104,10 +105,10 @@ export async function buildInstaller(options: SquirrelOptions, outputDirectory: async function pack(options: SquirrelOptions, directory: string, updateFile: string, outFile: string, version: string, packageCompressionLevel?: number) { const archive = archiver("zip", {zlib: {level: packageCompressionLevel == null ? 9 : packageCompressionLevel}}) - // const archiveOut = createWriteStream('/Users/develar/test.zip') const archiveOut = createWriteStream(outFile) const archivePromise = new BluebirdPromise(function (resolve, reject) { archive.on("error", reject) + archiveOut.on("error", reject) archiveOut.on("close", resolve) }) archive.pipe(archiveOut) diff --git a/src/winPackager.ts b/src/winPackager.ts index 0806bcb9dae..4e8c1a08d40 100644 --- a/src/winPackager.ts +++ b/src/winPackager.ts @@ -159,7 +159,6 @@ export class WinPackager extends PlatformPackager { "--set-version-string", "ProductName", appInfo.productName, "--set-version-string", "InternalName", appInfo.productName, "--set-version-string", "LegalCopyright", appInfo.copyright, - // cannot remove OriginalFilename, must be set to some value "--set-version-string", "OriginalFilename", "", "--set-file-version", appInfo.buildVersion, "--set-product-version", appInfo.version, diff --git a/src/windowsCodeSign.ts b/src/windowsCodeSign.ts index 3333dcf4f37..519a274a7f1 100644 --- a/src/windowsCodeSign.ts +++ b/src/windowsCodeSign.ts @@ -6,10 +6,10 @@ import { getBinFromBintray } from "./util/binDownload" //noinspection JSUnusedLocalSymbols const __awaiter = require("./util/awaiter") -const TOOLS_VERSION = "1.4.0" +const TOOLS_VERSION = "1.4.1" export function getSignVendorPath() { - return getBinFromBintray("winCodeSign", TOOLS_VERSION, "0496cf9d3c68cf00c3873a20794361c782d355c566f0b31a69422571deffeb69") + return getBinFromBintray("winCodeSign", TOOLS_VERSION, "bcafcb1aa9be7544ca9bdffda277e4dcf840f14964e51ed270f83fb850cf2e9e") } export interface SignOptions {