From 9a510c42c3239e5098a248e2f0d356b06e5f0fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 31 Dec 2018 16:56:24 +0000 Subject: [PATCH] setup: don't require the user to agree to GPL to complete setup. As @foone complains on twitter often enough, this should not require agreement for use since GPL is not an EULA. The definitions are inspired from the similar NSIS setup file from VLC. --- src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi | 4 ++++ src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi b/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi index fa440da09f..d83a4e0f64 100644 --- a/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi +++ b/src/WindowsInstaller/FreeCAD_WindowsInstaller.nsi @@ -55,6 +55,10 @@ outFile "..\..\${INSTNAME}.${VERSIONBUILD}_x86_unstable_setup.exe" #Interface Settings !define MUI_ABORTWARNING +# GPL is not an EULA, no need to agree to it. +!define MUI_LICENSEPAGE_BUTTON $(^NextBtn) +!define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue." + #Pages # rtf or txt file - remember if it is txt, it must be in the DOS text format (\r\n) !insertmacro MUI_PAGE_LICENSE "License.rtf" diff --git a/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi b/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi index 1c05d3c2b0..af2ce297a3 100644 --- a/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi +++ b/src/WindowsInstaller/FreeCAD_x64_WindowsInstaller.nsi @@ -55,6 +55,10 @@ outFile "..\..\${INSTNAME}.${VERSIONBUILD}_x64_unstable_setup.exe" #Interface Settings !define MUI_ABORTWARNING +# GPL is not an EULA, no need to agree to it. +!define MUI_LICENSEPAGE_BUTTON $(^NextBtn) +!define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue." + #Pages # rtf or txt file - remember if it is txt, it must be in the DOS text format (\r\n) !insertmacro MUI_PAGE_LICENSE "License.rtf"