fix(nsis): turkish lang - missed translation leads to error

electron-userland · Mar 22, 2018 · 9748776 · 9748776
1 parent f339278
commit 9748776
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/packages/builder-util/src/util.ts b/packages/builder-util/src/util.ts
@@ -136,7 +136,6 @@ function removeWineSpam(out: string) {
 }
 
 export interface ExtraSpawnOptions {
-  isDebugEnabled?: boolean
   isPipeInput?: boolean
 }
 
@@ -164,7 +163,7 @@ export function doSpawn(command: string, args: Array<string>, options?: SpawnOpt
   options.env = getProcessEnv(options.env)
 
   if (options.stdio == null) {
-    const isDebugEnabled = extraOptions == null || extraOptions.isDebugEnabled == null ? debug.enabled : extraOptions.isDebugEnabled
+    const isDebugEnabled = debug.enabled
     // do not ignore stdout/stderr if not debug, because in this case we will read into buffer and print on error
     options.stdio = [extraOptions != null && extraOptions.isPipeInput ? "pipe" : "ignore", isDebugEnabled ? "inherit" : "pipe", isDebugEnabled ? "inherit" : "pipe"]
   }
@@ -178,11 +177,11 @@ export function doSpawn(command: string, args: Array<string>, options?: SpawnOpt
   }
 }
 
-export function spawnAndWrite(command: string, args: Array<string>, data: string, options?: SpawnOptions, isDebugEnabled: boolean = false) {
-  const childProcess = doSpawn(command, args, options, {isPipeInput: true, isDebugEnabled})
+export function spawnAndWrite(command: string, args: Array<string>, data: string, options?: SpawnOptions) {
+  const childProcess = doSpawn(command, args, options, {isPipeInput: true})
   const timeout = setTimeout(() => childProcess.kill(), 4 * 60 * 1000)
   return new Promise<any>((resolve, reject) => {
-    handleProcess("close", childProcess, command, false, () => {
+    handleProcess("close", childProcess, command, true, () => {
       try {
         clearTimeout(timeout)
       }

diff --git a/packages/electron-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/electron-builder-lib/src/targets/nsis/NsisTarget.ts
@@ -463,7 +463,7 @@ export class NsisTarget extends Target {
       // we use NSIS_CONFIG_CONST_DATA_PATH=no to build makensis on Linux, but in any case it doesn't use stubs as MacOS/Windows version, so, we explicitly set NSISDIR
       env: {...process.env, NSISDIR: nsisPath},
       cwd: nsisTemplatesDir,
-    }, debug.enabled)
+    })
   }
 
   private async computeCommonInstallerScriptHeader() {

diff --git a/packages/electron-builder-lib/src/targets/nsis/nsisLang.ts b/packages/electron-builder-lib/src/targets/nsis/nsisLang.ts
@@ -94,7 +94,12 @@ function computeCustomMessageTranslations(messages: any, langConfigurator: LangC
         continue
       }
 
-      result.push(`LangString ${messageId} ${lcid[langWithRegion]} "${langToTranslations[lang].replace(/\n/g, "$\\r$\\n")}"`)
+      const value = langToTranslations[lang]
+      if (value == null) {
+        throw new Error(`${messageId} not specified for ${lang}`)
+      }
+
+      result.push(`LangString ${messageId} ${lcid[langWithRegion]} "${value.replace(/\n/g, "$\\r$\\n")}"`)
       unspecifiedLangs.delete(langWithRegion)
     }
 

diff --git a/packages/electron-builder-lib/src/targets/nsis/nsisUtil.ts b/packages/electron-builder-lib/src/targets/nsis/nsisUtil.ts
@@ -12,7 +12,7 @@ import { NsisTarget } from "./NsisTarget"
 export const nsisTemplatesDir = getTemplatePath("nsis")
 
 // noinspection SpellCheckingInspection
-export const NSIS_PATH = new Lazy(() => getBinFromGithub("nsis", "3.0.1.13", "WtEinikNm5ES8WSf1ZDefuUahn7iewbtVmJrRg4xWfm4eaESSJKy9pKIMRMgszdKw5e3YooCOqObnC5qJIfTLA=="))
+export const NSIS_PATH = new Lazy(() => getBinFromGithub("nsis", "3.0.3.0", "3cZfTAEgX/iatMcjmh4c8ZSwhO76Oqpneb4UPzT+uWxsAfZdUgSuls3WXwOtb9oY+wqSvY7+WRvO8944RSTUcg=="))
 
 export class AppPackageHelper {
   private readonly archToFileInfo = new Map<Arch, Promise<PackageFileInfo>>()

diff --git a/test/src/windows/oneClickInstallerTest.ts b/test/src/windows/oneClickInstallerTest.ts
@@ -184,7 +184,7 @@ test.ifAll.ifNotCiMac("menuCategory", app({
   }
 }))
 
-test.ifAll.ifNotCiMac("string menuCategory", app({
+test.ifNotCiMac("string menuCategory", app({
   targets: Platform.WINDOWS.createTarget(["nsis"], Arch.ia32),
   config: {
     extraMetadata: {