diff --git a/.idea/runConfigurations/winPackagerTest__debug_logging_.xml b/.idea/runConfigurations/winPackagerTest__debug_logging_.xml
index f929ef4bf3b..18875c1d738 100644
--- a/.idea/runConfigurations/winPackagerTest__debug_logging_.xml
+++ b/.idea/runConfigurations/winPackagerTest__debug_logging_.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/package.json b/package.json
index 5f61158dc8d..88027e908dc 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
"bluebird": "^3.3.4",
"command-line-args": "^2.1.6",
"electron-packager": "^6.0.0",
- "electron-winstaller-fixed": "^2.0.6-beta.5",
+ "electron-winstaller-fixed": "^2.0.6-beta.6",
"fs-extra": "^0.26.7",
"fs-extra-p": "^0.2.0",
"globby": "^4.0.0",
diff --git a/src/util.ts b/src/util.ts
index 3e5ef679e5e..86bec49a3a9 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -76,13 +76,13 @@ export function exec(file: string, args?: string[], options?: ExecOptions): Blue
}
else {
if (stdout.length !== 0) {
- console.error(stdout.toString())
+ console.log(stdout.toString())
}
- if (stderr.length !== 0) {
- reject(new Error(stderr.toString() + "\n" + error.toString()))
+ if (stderr.length === 0) {
+ reject(error)
}
else {
- reject(error)
+ reject(new Error(stderr.toString() + "\n" + error.toString()))
}
}
})
diff --git a/src/winPackager.ts b/src/winPackager.ts
index d674f1649c0..c95ab2cccd0 100644
--- a/src/winPackager.ts
+++ b/src/winPackager.ts
@@ -215,6 +215,6 @@ function parseIco(buffer: Buffer): Array {
return result
}
-function isIco(buffer: Buffer) {
+function isIco(buffer: Buffer): boolean {
return buffer.readUInt16LE(0) === 0 && buffer.readUInt16LE(2) === 1
}
\ No newline at end of file