fix(nsis): handle unquoted UninstallString #735

electron-userland · Sep 16, 2016 · 77f3277 · 77f3277
1 parent 63c67ef
commit 77f3277
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
     "yargs": "^5.0.0"
   },
   "optionalDependencies": {
-    "appdmg": "^0.4.5"
+    "appdmg-tf": "^0.4.7"
   },
   "config": {
     "pre-git": {

diff --git a/src/targets/dmg.ts b/src/targets/dmg.ts
@@ -43,7 +43,7 @@ export class DmgTarget extends Target {
       debug(`appdmg: ${JSON.stringify(dmgOptions, <any>null, 2)}`)
     }
 
-    const emitter = require("appdmg")(dmgOptions)
+    const emitter = require("appdmg-tf")(dmgOptions)
     await new BluebirdPromise((resolve, reject) => {
       emitter.on("error", reject)
       emitter.on("finish", resolve)

diff --git a/templates/nsis/installSection.nsh b/templates/nsis/installSection.nsh
@@ -4,7 +4,10 @@
   ${if} $R0 != ""
     Push $R0
     Call GetInQuotes
-    Pop $R0
+    Pop $R1
+    ${if} $R1 != ""
+      StrCpy $R0 "$R1"
+    ${endif}
 
     ReadRegStr $R1 ${ROOT_KEY} "${INSTALL_REGISTRY_KEY}" InstallLocation
     ${if} $R1 == ""

diff --git a/typings/appdmg.d.ts b/typings/appdmg.d.ts
@@ -15,7 +15,7 @@ declare namespace appdmg {
   }
 }
 
-declare module "appdmg" {
+declare module "appdmg-tf" {
   import { EventEmitter } from "events"
 
   function appdmg(options: appdmg.Options): EventEmitter