From f9c753e99b258867f953ad4a09a2a50f4d4ca07b Mon Sep 17 00:00:00 2001 From: Michael Steenbeek <1478678+Gymnasiast@users.noreply.github.com> Date: Sat, 7 Jun 2025 10:39:34 +0200 Subject: [PATCH] Fix version info of NSIS installer --- distribution/windows/install.nsi | 4 +--- distribution/windows/language/install_en.nsi | 4 ++-- distribution/windows/language/install_nl.nsi | Bin 5972 -> 6002 bytes 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/distribution/windows/install.nsi b/distribution/windows/install.nsi index 9b438f92da..b846cefaa3 100644 --- a/distribution/windows/install.nsi +++ b/distribution/windows/install.nsi @@ -19,8 +19,6 @@ Unicode True InstallDir "$PROGRAMFILES64\OpenRCT2\" !endif -!define SUPPORTED_OS "$(lsSupportedOS)" - ; Define root variable relative to installer !define PATH_ROOT "..\..\" !define BINARY_DIR "${PATH_ROOT}bin" @@ -41,7 +39,7 @@ VIAddVersionKey "InternalName" "InstOpenRCT2-${APPARCH}" VIAddVersionKey "FileVersion" "${APPVERSION}-${APPARCH}" VIAddVersionKey "LegalCopyright" " " ; Main Install settings -Name "$(lsInstallerName)" +Name "${APPNAMEANDVERSION}" ; NOTE: Keep trailing backslash! InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenRCT2" "Install Folder" diff --git a/distribution/windows/language/install_en.nsi b/distribution/windows/language/install_en.nsi index 5a9789f91f..b93c760842 100644 --- a/distribution/windows/language/install_en.nsi +++ b/distribution/windows/language/install_en.nsi @@ -5,7 +5,7 @@ LangString lsCannotInstallToRCT2Dir ${LANG_ENGLISH} "You cannot install OpenRCT2 LangString lsCannotInstallToRCTClassicDir ${LANG_ENGLISH} "You cannot install OpenRCT2 to the same directory as RollerCoaster Tycoon Classic." LangString lsComponentDescription ${LANG_ENGLISH} "Minimal OpenRCT2 installation. You must have RollerCoaster Tycoon 2 or Classic installed." LangString lsFinishPageLink ${LANG_ENGLISH} "Visit the OpenRCT2 site for more information" -LangString lsInstallerName ${LANG_ENGLISH} "${APPNAMEANDVERSION} ${PLATFORM} for ${SUPPORTED_OS}" +LangString lsInstallerName ${LANG_ENGLISH} "${APPNAMEANDVERSION} ${PLATFORM} for $(lsSupportedOS)" LangString lsNewWindowsVersionOnOldWindows ${LANG_ENGLISH} "You are trying to install the Windows XP SP3, Vista and newer version on Windows 95, 98, ME, 2000 or XP without SP3. This is will not work. Please download the correct version. Do you really want to continue?" LangString lsOldWindowsVersionOnNewWindows ${LANG_ENGLISH} "You are trying to install the Windows 95, 98, 2000 and XP without SP3 version on Windows XP SP3, Vista or newer. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" LangString lsOpenRCT2IsRunning ${LANG_ENGLISH} "OpenRCT2 is running. Please close it and retry." @@ -20,4 +20,4 @@ LangString lsUpgradeNotice ${LANG_ENGLISH} "Welcome to ${APPNAMEANDVERSION} Setu VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Installs ${APPNAMEANDVERSION}" VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "OpenRCT2 Developers" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs ${APPNAMEANDVERSION}" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "OpenRCT2 ${PLATFORM} Installer for ${SUPPORTED_OS}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "OpenRCT2 ${PLATFORM} Installer for Windows 7 and later" diff --git a/distribution/windows/language/install_nl.nsi b/distribution/windows/language/install_nl.nsi index f6fa68718e10513010af5aea0071b53bc002633f..e7ce00f535f54f3a651cb2f90231254d4f62bf86 100644 GIT binary patch delta 50 zcmcbj_epQV6AoDoh8%`shG2$Lh5{hWXDDJQVMt|2VekivX>R_{Vazvq9jCzL0)9OJ Ddd&_A delta 75 zcmeyQcSUc*6AtNWhG2$Jh5#V+X9!{lVQ^(|VTcE^gBfZ!Gjba9DXB2vQNp0az{LOn Dq23P2