From 18d9a2c0db6d04c14ce5f0b38895be32b4768876 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 20 Jan 2023 13:15:23 +0100 Subject: [PATCH 1/3] Make Bonjour optional & visible in apps & programs --- windows/build.xml | 2 +- .../Bootstrapper/Cyberduck Bootstrapper.wxs | 8 +- .../Cyberduck.Bootstrapper.wixproj | 3 + .../main/wix/Bootstrapper/InstallerTheme.xml | 100 ++++++++++++++++++ 4 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 windows/src/main/wix/Bootstrapper/InstallerTheme.xml diff --git a/windows/build.xml b/windows/build.xml index 366e261ae36..0b311ba5cfe 100755 --- a/windows/build.xml +++ b/windows/build.xml @@ -117,7 +117,7 @@ - + diff --git a/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs b/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs index a3ac9315b1c..839d5dfe791 100644 --- a/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs +++ b/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs @@ -6,9 +6,11 @@ + LogoSideFile="$(var.SetupDir)welcome.bmp" + ThemeFile="InstallerTheme.xml"/> + @@ -29,8 +31,8 @@ - - + + diff --git a/windows/src/main/wix/Bootstrapper/Cyberduck.Bootstrapper.wixproj b/windows/src/main/wix/Bootstrapper/Cyberduck.Bootstrapper.wixproj index ab5e1c65e6d..fd1adf872c5 100644 --- a/windows/src/main/wix/Bootstrapper/Cyberduck.Bootstrapper.wixproj +++ b/windows/src/main/wix/Bootstrapper/Cyberduck.Bootstrapper.wixproj @@ -51,6 +51,9 @@ INSTALLFOLDER + + + diff --git a/windows/src/main/wix/Bootstrapper/InstallerTheme.xml b/windows/src/main/wix/Bootstrapper/InstallerTheme.xml new file mode 100644 index 00000000000..0955c724043 --- /dev/null +++ b/windows/src/main/wix/Bootstrapper/InstallerTheme.xml @@ -0,0 +1,100 @@ + + + + + + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + #(loc.Title) + + #(loc.HelpHeader) + #(loc.HelpText) + + + + #(loc.Title) + + #(loc.InstallHeader) + #(loc.InstallMessage) + + #(loc.InstallLicenseLinkText) + #(loc.InstallVersion) + #(loc.InstallAcceptCheckbox) + + + + + + #(loc.Title) + + #(loc.OptionsHeader) + #(loc.OptionsLocationLabel) + + + Bonjour + + + + + + #(loc.Title) + + #(loc.FilesInUseHeader) + #(loc.FilesInUseLabel) + + + + + + + + + + #(loc.Title) + + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + + + + #(loc.Title) + + #(loc.ModifyHeader) + + + + + + #(loc.Title) + + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) + + #(loc.SuccessRestartText) + + + + + #(loc.Title) + + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + + + From f4378cf4d0a8c502676d7a7b7c4dd682d4990d28 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Mon, 8 May 2023 17:30:38 +0200 Subject: [PATCH 2/3] make chocolatey install bonjour --- setup/chocolatey/cyberduck/cyberduck.nuspec | 1 + setup/chocolatey/cyberduck/tools/chocolateyInstall.ps1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/chocolatey/cyberduck/cyberduck.nuspec b/setup/chocolatey/cyberduck/cyberduck.nuspec index 6dca419ab5b..1fc112e70b1 100644 --- a/setup/chocolatey/cyberduck/cyberduck.nuspec +++ b/setup/chocolatey/cyberduck/cyberduck.nuspec @@ -20,6 +20,7 @@ https://lists.cyberduck.io https://github.com/iterate-ch/cyberduck + diff --git a/setup/chocolatey/cyberduck/tools/chocolateyInstall.ps1 b/setup/chocolatey/cyberduck/tools/chocolateyInstall.ps1 index ca9b6c5be4e..6f7148f3213 100644 --- a/setup/chocolatey/cyberduck/tools/chocolateyInstall.ps1 +++ b/setup/chocolatey/cyberduck/tools/chocolateyInstall.ps1 @@ -1,6 +1,6 @@ $packageName = 'cyberduck' $installerType = 'exe' -$silentArgs = '/quiet' +$silentArgs = '/quiet InstallBonjour=0' $url = 'https://update.cyberduck.io/windows/Cyberduck-Installer-${VERSION}.${REVISION}.exe' $checksum = '${CHECKSUM}' $checksumType = 'sha256' From 7c5cb60bed68ce005775455399a0f911c15230b2 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 9 May 2023 13:43:05 +0200 Subject: [PATCH 3/3] Continue providing Bonjour if already installed --- .../src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs b/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs index 839d5dfe791..4670c451b2e 100644 --- a/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs +++ b/windows/src/main/wix/Bootstrapper/Cyberduck Bootstrapper.wxs @@ -11,6 +11,11 @@ + + + + + @@ -31,8 +36,7 @@ - - +