Fix bug where icns conversion fails silently

2016-03-08 20:55:42 +08:00 · 2016-03-08 20:55:42 +08:00 · e2d762b721
parent c8d6cef815
commit e2d762b721
1 changed files with 10 additions and 5 deletions
--- a/src/helpers/pngToIcns.js
+++ b/src/helpers/pngToIcns.js
@ -26,11 +26,16 @@ function pngToIcns(pngSrc, icnsDest, callback) {
    }

    shell.exec(`${PNG_TO_ICNS_BIN_PATH} ${pngSrc} ${icnsDest}`, {silent: true}, (exitCode, stdOut, stdError) => {
-        if (exitCode) {
-            callback({
-                stdOut: stdOut,
-                stdError: stdError
-            }, pngSrc);
+        if (stdOut.includes('icon.iconset:error') || exitCode) {
+            if (exitCode) {
+                callback({
+                    stdOut: stdOut,
+                    stdError: stdError
+                }, pngSrc);
+                return;
+            }
+
+            callback(stdOut, pngSrc);
            return;
        }