Release 1.4.38

Installs over the damaged 1.4.35-1.4.37 uninstallers, and ships a valid one.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

BUILD-AND-DEPLOY.md

@@ -70,6 +70,12 @@ Notes:
   for you. The TV's updater compares versions numerically and only offers a HIGHER version.
 - If `WIN_CSC_LINK` / `CSC_LINK` / `CSC_KEY_PASSWORD` / `CSC_KEYCHAIN` exist in your environment,
   `build-win.cjs` removes them for the build (electron-builder aborts on an EMPTY `WIN_CSC_LINK`).
+- **Keep `build/installerIcon.ico`.** On macOS electron-builder rebuilds the uninstaller in JavaScript
+  and leaves out NSIS's icon patch; if the installer and uninstaller icons differ, the uninstaller fails
+  NSIS's integrity check, and that version can then never be updated or uninstalled. This file makes
+  both use one icon (NSIS's own default, so nothing looks different). `build-win.cjs` refuses to build
+  without it. Versions 1.4.35–1.4.37 shipped without it; `build/installer.nsh` installs over their
+  damaged uninstallers instead of running them.
 - On Windows, if the build fails while extracting `winCodeSign` (symlink / permission errors), run the
   terminal as administrator or turn on Developer Mode, delete
   `%LOCALAPPDATA%\electron-builder\Cache\winCodeSign`, and build again.

build/installer.nsh

@@ -4,3 +4,71 @@
   IfFileExists "$INSTDIR\resources\app.asar.unpacked\vendor\redist\vc_redist.x64.exe" 0 +2
     ExecWait '"$INSTDIR\resources\app.asar.unpacked\vendor\redist\vc_redist.x64.exe" /install /quiet /norestart' $0
 !macroend
+
+; ---------------------------------------------------------------------------------------------------
+; Replaces electron-builder's "is the app running?" check (customCheckAppRunning). Runs at the start of
+; installing, BEFORE the old version is removed and before any file is copied.
+;
+; The stock check only looks for "Bible App.exe". But the app also starts programs from its own folder
+; - the local AI server (llama-server.exe), speech (whisper), the upscaler - and if the app is closed
+; hard, those are left running. They hold their files open, so copying the new version fails and the
+; installer says "Bible App cannot be closed. Please close it manually and click Retry" even though
+; the app is plainly closed, and Retry can never succeed. So:
+;   1. ask the app to close (it then stops the AI server itself), and give it a moment;
+;   2. force-close anything named Bible App.exe that is still there;
+;   3. force-close the app's own helper programs by name (plain taskkill, nothing to go wrong);
+;   4. as a backstop, force-close EVERY program running from this install folder, whatever its name.
+; Step 4 matches by folder, via WMI (works from this 32-bit installer on 64-bit Windows, where a
+; 32-bit process cannot read a 64-bit process's path). The folder travels in an environment variable
+; so a quote or space in it can never break the command, and it refuses to act on a bare drive.
+; No question is asked first: installing this version replaces the app, which is what was asked for.
+; ---------------------------------------------------------------------------------------------------
+!macro customCheckAppRunning
+  DetailPrint `Closing "${PRODUCT_NAME}"...`
+  nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "USERNAME eq %USERNAME%"`
+  Pop $0
+  Sleep 2500
+  nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /f /t /im "${APP_EXECUTABLE_FILENAME}" /fi "USERNAME eq %USERNAME%"`
+  Pop $0
+  nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /f /t /im llama-server.exe /im whisper-cli.exe /im realesrgan-ncnn-vulkan.exe /fi "USERNAME eq %USERNAME%"`
+  Pop $0
+  System::Call 'Kernel32::SetEnvironmentVariable(t "BIBLEAPP_INSTDIR", t "$INSTDIR")'
+  StrCpy $1 "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe"
+  ${If} ${FileExists} "$WINDIR\Sysnative\WindowsPowerShell\v1.0\powershell.exe"
+    StrCpy $1 "$WINDIR\Sysnative\WindowsPowerShell\v1.0\powershell.exe"
+  ${EndIf}
+  StrCpy $2 `"$1" -NoProfile -NonInteractive -ExecutionPolicy Bypass -Command "$$r = $$env:BIBLEAPP_INSTDIR.TrimEnd('\'); if ($$r.Split('\').Count -lt 2) { exit }; $$d = $$r + '\'; Get-CimInstance Win32_Process | Where-Object { $$_.ExecutablePath -and $$_.ExecutablePath.StartsWith($$d, [StringComparison]::OrdinalIgnoreCase) } | ForEach-Object { Stop-Process -Id $$_.ProcessId -Force -ErrorAction SilentlyContinue }"`
+  DetailPrint `Closing anything else still running from "${PRODUCT_NAME}"'s folder...`
+  nsExec::Exec $2
+  Pop $0
+  Sleep 1000
+  !insertmacro bibleAppSkipDamagedUninstaller SHELL_CONTEXT
+  !insertmacro bibleAppSkipDamagedUninstaller HKCU
+!macroend
+
+; ---------------------------------------------------------------------------------------------------
+; Versions 1.4.35 - 1.4.37 were built on macOS before build/installerIcon.ico existed, and their
+; uninstallers are damaged: they fail NSIS's own integrity check ("Installer integrity check has
+; failed"). electron-builder rebuilds the uninstaller in JavaScript on macOS and leaves out NSIS's
+; icon patch, so whenever the installer and uninstaller icons differ (NSIS's two defaults do), the
+; checksum is wrong. An update runs the PREVIOUS version's uninstaller first, so those versions could
+; never be updated: the damaged uninstaller fails, and the installer reports "Bible App cannot be
+; closed" (it also cannot be uninstalled from Windows Settings).
+;
+; For exactly those versions, the old uninstaller is not run: its UninstallString is cleared, so
+; electron-builder's uninstallOldVersion finds nothing to run, and the new files are copied over the
+; old ones. This installer then writes a fresh, valid uninstaller and registry entry. Every other
+; version still goes through the normal uninstall-then-install path.
+; ---------------------------------------------------------------------------------------------------
+!macro bibleAppSkipDamagedUninstaller ROOT
+  ReadRegStr $3 ${ROOT} "${UNINSTALL_REGISTRY_KEY}" DisplayVersion
+  ${If} $3 == "1.4.35"
+  ${OrIf} $3 == "1.4.36"
+  ${OrIf} $3 == "1.4.37"
+    DetailPrint `Version $3's uninstaller is damaged; installing over it instead.`
+    DeleteRegValue ${ROOT} "${UNINSTALL_REGISTRY_KEY}" UninstallString
+    !ifdef UNINSTALL_REGISTRY_KEY_2
+      DeleteRegValue ${ROOT} "${UNINSTALL_REGISTRY_KEY_2}" UninstallString
+    !endif
+  ${EndIf}
+!macroend

main.cjs

@@ -355,6 +355,9 @@ async function createWindow () {
         quit: () => { try { app.quit(); } catch (_) {} },
         runInstaller: (installerPath) => {
           // Launch the installer detached, then quit so it can replace the running app.
+          // Stop the local AI server FIRST: it runs from the install folder, and one left running holds
+          // its files open, so the installer cannot copy the new version over them ("cannot be closed").
+          try { stopLlamaServer(); } catch (_) {}
           try {
             const { spawn } = require('child_process');
             const child = spawn(installerPath, [], { detached: true, stdio: 'ignore', windowsHide: false });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bible-app",
-  "version": "1.4.36",
+  "version": "1.4.38",
   "description": "Minimalist Bible App for Portrait-Oriented Touchscreen TV",
   "type": "module",
   "main": "main.cjs",

tools/build-win.cjs

@@ -12,8 +12,14 @@
  *  - a clean signing environment. There is no code-signing certificate. electron-builder aborts on
  *    an EMPTY WIN_CSC_LINK ("Env WIN_CSC_LINK is not correct"), so those variables are removed
  *    rather than blanked, and identity auto-discovery is turned off.
+ *  - a working uninstaller. On macOS electron-builder rebuilds the NSIS uninstaller in JavaScript and
+ *    skips NSIS's icon patch, so unless the installer and uninstaller use the SAME icon the uninstaller
+ *    fails NSIS's integrity check — and then that version can never be updated or uninstalled
+ *    (1.4.35-1.4.37 shipped like that). build/installerIcon.ico makes electron-builder use one icon for
+ *    both, so this refuses to build without it.
  */
 const { spawnSync } = require('child_process');
+const fs = require('fs');
 const path = require('path');
 
 const env = { ...process.env, CSC_IDENTITY_AUTO_DISCOVERY: 'false' };
@@ -21,6 +27,13 @@ for (const key of ['CSC_LINK', 'WIN_CSC_LINK', 'CSC_KEY_PASSWORD', 'WIN_CSC_KEY_
   delete env[key];
 }
 
+const ICON = path.join(__dirname, '..', 'build', 'installerIcon.ico');
+if (!fs.existsSync(ICON)) {
+  console.error('build/installerIcon.ico is missing. Without it the uninstaller built on macOS is damaged');
+  console.error('("Installer integrity check has failed") and the version could never be updated. See tools/build-win.cjs.');
+  process.exit(1);
+}
+
 const extra = process.argv.slice(2);
 const args = ['electron-builder', '--win', '--x64', ...extra];