aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2020-01-02 12:04:56 -0800
committerAnders Broman <a.broman58@gmail.com>2020-01-08 04:55:50 +0000
commit200124d4209b5539e220cd6111d86d29e54e31ce (patch)
tree4625bdbe589bcd9627ab7c8badd551949815cad3 /packaging/nsis
parent44b0cb187d63668b83a667af04f9bb7ff45333ca (diff)
NSIS: Make the licensing page match reality.
The NSIS licensing page is centered around making the user agree to a EULA. We don't have one of those. Replace the "you must accept" and "I agree" text with something more neutral. We could alternatively omit with the licensing page altogether, but the GPL is an important aspect of the project and deserves some sort of mention. Bug: 1115 Change-Id: I5fd5beac2188b61a90c2842de7d7547aa815ff4f Reviewed-on: https://code.wireshark.org/review/35624 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis')
-rw-r--r--packaging/nsis/wireshark.nsi11
1 files changed, 5 insertions, 6 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 710042b391..c29282dbd5 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -83,7 +83,12 @@ BrandingText "Wireshark${U+00ae} Installer"
; ============================================================================
!insertmacro MUI_PAGE_WELCOME
+
+!define MUI_LICENSEPAGE_TEXT_TOP "Wireshark is distributed under the GNU General Public License."
+!define MUI_LICENSEPAGE_TEXT_BOTTOM "This is not an end user license agreement (EULA). It is provided here for informational purposes only."
+!define MUI_LICENSEPAGE_BUTTON "Noted"
!insertmacro MUI_PAGE_LICENSE "${STAGING_DIR}\COPYING.txt"
+
!insertmacro MUI_PAGE_COMPONENTS
!ifdef QT_DIR
Page custom DisplayAdditionalTasksPage LeaveAdditionalTasksPage
@@ -160,12 +165,6 @@ Page custom DisplayUSBPcapPage
!insertmacro GetOptions
; ============================================================================
-; License page configuration
-; ============================================================================
-LicenseText "Wireshark is distributed under the GNU General Public License."
-LicenseData "${STAGING_DIR}\COPYING.txt"
-
-; ============================================================================
; Component page configuration
; ============================================================================
ComponentText "The following components are available for installation."