From c2bf9e4cdcc8c1fb28de9399bd4fafa3c17ec7e7 Mon Sep 17 00:00:00 2001 From: hensm Date: Mon, 11 May 2020 18:42:02 +0100 Subject: [PATCH] Call Bonjour installer from NSIS installer --- app/bin/build.js | 2 +- app/packaging/win/installer.nsi | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/bin/build.js b/app/bin/build.js index 5975029..b359f69 100644 --- a/app/bin/build.js +++ b/app/bin/build.js @@ -262,7 +262,7 @@ async function build () { } // Remove build directory - //fs.removeSync(BUILD_PATH); + fs.removeSync(BUILD_PATH); } /** diff --git a/app/packaging/win/installer.nsi b/app/packaging/win/installer.nsi index fd3fdd8..e547493 100644 --- a/app/packaging/win/installer.nsi +++ b/app/packaging/win/installer.nsi @@ -47,6 +47,17 @@ Section File "{{bindingName}}" File "{{manifestName}}" + # Install Bonjour + IfFileExists "$SYSDIR\dnssd.dll" endInstallBonjour beginInstallBonjour + Goto endInstallBonjour + beginInstallBonjour: + MessageBox MB_YESNO "Install Bonjour dependency?" /SD IDYES IDNO endInstallBonjour + File /oname=Bonjour64.msi "C:\Program Files\Bonjour SDK\Installer\Bonjour64.msi" + ExecWait '"msiexec" /i "$INSTDIR\Bonjour64.msi"' + endInstallBonjour: + Delete "$INSTDIR\Bonjour64.msi" + + # Native manifest key WriteRegStr HKLM "${KEY_MANIFEST}" "" "$INSTDIR\{{manifestName}}" @@ -73,6 +84,7 @@ Section "uninstall" # Remove manifest and executable dir DeleteRegKey HKLM ${KEY_MANIFEST} Delete "$INSTDIR\{{executableName}}" + Delete "$INSTDIR\{{bindingName}}" Delete "$INSTDIR\{{manifestName}}" RMDir $INSTDIR SectionEnd