feat: validate icon permissions

develar · develar · commit c03ad3851cf8 · 2018-03-05T20:23:56.000+01:00
Close #2654
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.6.0",
+    "app-builder-bin": "1.7.0",
     "archiver": "^2.1.1",
     "async-exit-hook": "^2.0.1",
     "aws-sdk": "^2.205.0",
@@ -48,7 +48,7 @@
     "ini": "^1.3.5",
     "is-ci": "^1.1.0",
     "isbinaryfile": "^3.0.2",
-    "js-yaml": "^3.10.0",
+    "js-yaml": "^3.11.0",
     "lazy-val": "^1.0.3",
     "lodash.isequal": "^4.5.0",
     "mime": "^2.2.0",
diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json
@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "1.6.0",
+    "app-builder-bin": "1.7.0",
     "temp-file": "^3.1.1",
     "fs-extra-p": "^4.5.2",
     "is-ci": "^1.1.0",
@@ -24,7 +24,7 @@
     "7zip-bin": "~3.1.0",
     "semver": "^5.5.0",
     "lazy-val": "^1.0.3",
-    "js-yaml": "^3.10.0"
+    "js-yaml": "^3.11.0"
   },
   "typings": "./out/util.d.ts"
 }
diff --git a/packages/builder-util/src/DebugLogger.ts b/packages/builder-util/src/DebugLogger.ts
@@ -1,4 +1,3 @@
-import BluebirdPromise from "bluebird-lst"
 import { outputFile } from "fs-extra-p"
 import { serializeToYaml } from "./util"
 
@@ -46,7 +45,7 @@ export class DebugLogger {
       return outputFile(file, serializeToYaml(this.data))
     }
     else {
-      return BluebirdPromise.resolve()
+      return Promise.resolve()
     }
   }
 }
diff --git a/packages/builder-util/src/asyncTaskManager.ts b/packages/builder-util/src/asyncTaskManager.ts
@@ -29,7 +29,7 @@ export class AsyncTaskManager {
       .catch(it => {
         log.debug({error: it.message || it.toString()}, "async task error")
         this.errors.push(it)
-        return BluebirdPromise.resolve(null)
+        return Promise.resolve(null)
       }))
   }
 
diff --git a/packages/dmg-builder/package.json b/packages/dmg-builder/package.json
@@ -18,7 +18,7 @@
     "parse-color": "^1.0.0",
     "builder-util": "^0.0.0-semantic-release",
     "iconv-lite": "^0.4.19",
-    "js-yaml": "^3.10.0",
+    "js-yaml": "^3.11.0",
     "electron-builder-lib": "~0.0.0-semantic-release",
     "sanitize-filename": "^1.6.1"
   },
diff --git a/packages/electron-builder-lib/package.json b/packages/electron-builder-lib/package.json
@@ -42,7 +42,7 @@
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.6.0",
+    "app-builder-bin": "1.7.0",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.5",
     "chromium-pickle-js": "^0.2.0",
@@ -54,7 +54,7 @@
     "hosted-git-info": "^2.5.0",
     "is-ci": "^1.1.0",
     "isbinaryfile": "^3.0.2",
-    "js-yaml": "^3.10.0",
+    "js-yaml": "^3.11.0",
     "read-config-file": "3.0.0",
     "minimatch": "^3.0.4",
     "normalize-package-data": "^2.4.0",
diff --git a/packages/electron-builder-lib/src/fileMatcher.ts b/packages/electron-builder-lib/src/fileMatcher.ts
@@ -229,7 +229,7 @@ export function getFileMatchers(config: Configuration, name: "files" | "extraFil
 /** @internal */
 export function copyFiles(matchers: Array<FileMatcher> | null): Promise<any> {
   if (matchers == null || matchers.length === 0) {
-    return BluebirdPromise.resolve()
+    return Promise.resolve()
   }
 
   return BluebirdPromise.map(matchers, async (matcher: FileMatcher) => {
diff --git a/packages/electron-builder-lib/src/packager.ts b/packages/electron-builder-lib/src/packager.ts
@@ -497,7 +497,7 @@ function createOutDirIfNeed(targetList: Array<Target>, createdOutDirs: Set<strin
       return ensureDir(it)
     })
   }
-  return BluebirdPromise.resolve()
+  return Promise.resolve()
 }
 
 export interface BuildResult {
diff --git a/packages/electron-builder-lib/src/remoteBuilder/RemoteBuilder.ts b/packages/electron-builder-lib/src/remoteBuilder/RemoteBuilder.ts
@@ -45,7 +45,7 @@ export class RemoteBuilder {
 
   build(): Promise<any> {
     if (this.buildStarted) {
-      return BluebirdPromise.resolve()
+      return Promise.resolve()
     }
 
     this.buildStarted = true
diff --git a/packages/electron-builder-lib/src/targets/nsis/nsisUtil.ts b/packages/electron-builder-lib/src/targets/nsis/nsisUtil.ts
@@ -70,7 +70,7 @@ export class CopyElevateHelper {
     }
 
     if (isPackElevateHelper === false) {
-      return BluebirdPromise.resolve()
+      return Promise.resolve()
     }
 
     let promise = this.copied.get(appOutDir)
diff --git a/packages/electron-builder/src/cli/install-app-deps.ts b/packages/electron-builder/src/cli/install-app-deps.ts
@@ -50,7 +50,7 @@ export async function installAppDeps(args: any) {
   const muonVersion = config.muonVersion
   const results = await BluebirdPromise.all<string>([
     computeDefaultAppDirectory(projectDir, use(config.directories, it => it!.app)),
-    muonVersion == null ? getElectronVersion(projectDir, config, packageMetadata) : BluebirdPromise.resolve(muonVersion),
+    muonVersion == null ? getElectronVersion(projectDir, config, packageMetadata) : Promise.resolve(muonVersion),
   ])
 
   // if two package.json — force full install (user wants to install/update app deps in addition to dev)
diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json
@@ -15,7 +15,7 @@
     "lazy-val": "^1.0.3",
     "bluebird-lst": "^1.0.5",
     "fs-extra-p": "^4.5.2",
-    "js-yaml": "^3.10.0",
+    "js-yaml": "^3.11.0",
     "semver": "^5.5.0",
     "source-map-support": "^0.5.3",
     "builder-util-runtime": "~0.0.0-semantic-release",
diff --git a/packages/electron-updater/src/AppUpdater.ts b/packages/electron-updater/src/AppUpdater.ts
@@ -1,4 +1,3 @@
-import BluebirdPromise from "bluebird-lst"
 import { AllPublishOptions, asArray, CancellationToken, newError, PublishConfiguration, UpdateInfo, UUID } from "builder-util-runtime"
 import { randomBytes } from "crypto"
 import { Notification } from "electron"
@@ -226,7 +225,7 @@ export abstract class AppUpdater extends EventEmitter {
 
   checkForUpdatesAndNotify(): Promise<UpdateCheckResult | null> {
     if (isDev) {
-      return BluebirdPromise.resolve(null)
+      return Promise.resolve(null)
     }
 
     this.signals.updateDownloaded(it => {
diff --git a/packages/electron-updater/src/differentialDownloader/DataSplitter.ts b/packages/electron-updater/src/differentialDownloader/DataSplitter.ts
@@ -1,4 +1,3 @@
-import BluebirdPromise from "bluebird-lst"
 import { newError } from "builder-util-runtime"
 import { createReadStream } from "fs-extra-p"
 import { Writable } from "stream"
@@ -158,7 +157,7 @@ export class DataSplitter extends Writable {
   }
 
   private copyExistingData(index: number, end: number) {
-    return new BluebirdPromise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       const w = () => {
         if (index === end) {
           resolve()
@@ -218,10 +217,10 @@ export class DataSplitter extends Writable {
     this.actualPartLength += end - start
     const out = this.out
     if (out.write(start === 0 && data.length === end ? data : data.slice(start, end))) {
-      return BluebirdPromise.resolve()
+      return Promise.resolve()
     }
     else {
-      return new BluebirdPromise((resolve, reject) => {
+      return new Promise((resolve, reject) => {
         out.on("error", reject)
         out.once("drain", () => {
           out.removeListener("error", reject)
diff --git a/test/src/BuildTest.ts b/test/src/BuildTest.ts
@@ -120,7 +120,7 @@ test.ifLinuxOrDevMac("afterPack", () => {
     config: {
       afterPack: () => {
         called++
-        return BluebirdPromise.resolve()
+        return Promise.resolve()
       }
     }
   }, {
@@ -137,7 +137,7 @@ test.ifLinuxOrDevMac("afterSign", () => {
     config: {
       afterSign: () => {
         called++
-        return BluebirdPromise.resolve()
+        return Promise.resolve()
       }
     }
   }, {
@@ -236,6 +236,6 @@ test.ifAll.ifDevOrLinuxCi("posix smart unpack", app({
   packed: context => verifySmartUnpack(context.getResources(Platform.LINUX))}))
 
 test("wine version", async () => {
-  await checkWineVersion(BluebirdPromise.resolve("1.9.23 (Staging)"))
-  await checkWineVersion(BluebirdPromise.resolve("2.0-rc2"))
+  await checkWineVersion(Promise.resolve("1.9.23 (Staging)"))
+  await checkWineVersion(Promise.resolve("2.0-rc2"))
 })
diff --git a/test/src/helpers/downloadElectron.ts b/test/src/helpers/downloadElectron.ts
@@ -9,7 +9,7 @@ const downloadElectron: (options: any) => Promise<any> = BluebirdPromise.promisi
 export function deleteOldElectronVersion(): Promise<any> {
   // on CircleCi no need to clean manually
   if (process.env.CIRCLECI || !isCi) {
-    return BluebirdPromise.resolve()
+    return Promise.resolve()
   }
 
   const cacheDir = require("env-paths")("electron", {suffix: ""}).cache
diff --git a/test/src/helpers/winHelper.ts b/test/src/helpers/winHelper.ts
@@ -1,4 +1,3 @@
-import BluebirdPromise from "bluebird-lst"
 import { walk } from "builder-util/out/fs"
 import { Arch, Platform } from "electron-builder"
 import { readAsarJson } from "electron-builder-lib/out/asar/asar"
@@ -31,7 +30,7 @@ export async function checkHelpers(resourceDir: string, packElevateHelper: boole
 
 export async function doTest(outDir: string, perUser: boolean, productFilename = "TestApp Setup", name = "TestApp", menuCategory: string | null = null, packElevateHelper = true) {
   if (process.env.DO_WINE !== "true") {
-    return BluebirdPromise.resolve()
+    return Promise.resolve()
   }
 
   const wine = new WineManager()
diff --git a/test/src/mac/masTest.ts b/test/src/mac/masTest.ts
@@ -40,7 +40,7 @@ test.ifAll("custom mas", () => {
         entitlements: "mas-entitlements file path",
         "entitlements-inherit": "mas-entitlementsInherit file path",
       })
-      return BluebirdPromise.resolve(null)
+      return Promise.resolve(null)
     }
   })
 })
@@ -62,7 +62,7 @@ test.ifAll("entitlements in the package.json", () => {
         entitlements: "osx-entitlements file path",
         "entitlements-inherit": "osx-entitlementsInherit file path",
       })
-      return BluebirdPromise.resolve()
+      return Promise.resolve()
     }
   })
 })
@@ -82,7 +82,7 @@ test.ifAll("entitlements in build dir", () => {
         entitlements: path.join(context.projectDir, "build", "entitlements.mac.plist"),
         "entitlements-inherit": path.join(context.projectDir, "build", "entitlements.mac.inherit.plist"),
       })
-      return BluebirdPromise.resolve()
+      return Promise.resolve()
     }
   })
 })
diff --git a/yarn.lock b/yarn.lock
@@ -275,25 +275,25 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
-app-builder-bin-linux@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.6.0.tgz#d7731d7988b8a740e74d591cbd565f168a266111"
+app-builder-bin-linux@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.7.0.tgz#83894c51e224382a7268997cc8af1283c1be21e3"
 
-app-builder-bin-mac@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.6.0.tgz#c976da70796d67aeb7134a57899636f2581d1c67"
+app-builder-bin-mac@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.7.0.tgz#067a91d612fd3c2b687a097343ec4bb5f42c2e5f"
 
-app-builder-bin-win@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.6.0.tgz#528ef96430d519c270b4de260bea0ddc70df1733"
+app-builder-bin-win@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.7.0.tgz#caf81af88c5506717e4015880981b4ed3508414f"
 
-app-builder-bin@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.6.0.tgz#c0e88a488d4c23c2e7fe0bbfb70c1d61165be206"
+app-builder-bin@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.7.0.tgz#cb83e469d511f3516af7bca5288b692604bbd5c1"
   optionalDependencies:
-    app-builder-bin-linux "1.6.0"
-    app-builder-bin-mac "1.6.0"
-    app-builder-bin-win "1.6.0"
+    app-builder-bin-linux "1.7.0"
+    app-builder-bin-mac "1.7.0"
+    app-builder-bin-win "1.7.0"
 
 append-transform@^0.4.0:
   version "0.4.0"
@@ -3259,6 +3259,13 @@ js-yaml@^3.10.0, js-yaml@^3.4.2, js-yaml@^3.7.0, js-yaml@^3.9.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js2xmlparser@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-3.0.0.tgz#3fb60eaa089c5440f9319f51760ccd07e2499733"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import BluebirdPromise from "bluebird-lst"`
`2`	`1`	`import { outputFile } from "fs-extra-p"`
`3`	`2`	`import { serializeToYaml } from "./util"`
`4`	`3`
`@@ -46,7 +45,7 @@ export class DebugLogger {`
`46`	`45`	`return outputFile(file, serializeToYaml(this.data))`
`47`	`46`	`}`
`48`	`47`	`else {`
`49`		`- return BluebirdPromise.resolve()`
	`48`	`+ return Promise.resolve()`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export class AsyncTaskManager {`
`29`	`29`	`.catch(it => {`
`30`	`30`	`log.debug({error: it.message \|\| it.toString()}, "async task error")`
`31`	`31`	`this.errors.push(it)`
`32`		`- return BluebirdPromise.resolve(null)`
	`32`	`+ return Promise.resolve(null)`
`33`	`33`	`}))`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ export function getFileMatchers(config: Configuration, name: "files" \| "extraFil`
`229`	`229`	`/** @internal */`
`230`	`230`	`export function copyFiles(matchers: Array<FileMatcher> \| null): Promise<any> {`
`231`	`231`	`if (matchers == null \|\| matchers.length === 0) {`
`232`		`- return BluebirdPromise.resolve()`
	`232`	`+ return Promise.resolve()`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`return BluebirdPromise.map(matchers, async (matcher: FileMatcher) => {`
Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ function createOutDirIfNeed(targetList: Array<Target>, createdOutDirs: Set<strin`
`497`	`497`	`return ensureDir(it)`
`498`	`498`	`})`
`499`	`499`	`}`
`500`		`- return BluebirdPromise.resolve()`
	`500`	`+ return Promise.resolve()`
`501`	`501`	`}`
`502`	`502`
`503`	`503`	`export interface BuildResult {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export class RemoteBuilder {`
`45`	`45`
`46`	`46`	`build(): Promise<any> {`
`47`	`47`	`if (this.buildStarted) {`
`48`		`- return BluebirdPromise.resolve()`
	`48`	`+ return Promise.resolve()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`this.buildStarted = true`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class CopyElevateHelper {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if (isPackElevateHelper === false) {`
`73`		`- return BluebirdPromise.resolve()`
	`73`	`+ return Promise.resolve()`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`let promise = this.copied.get(appOutDir)`