From 1d650523e2509e7841260d7ab4b23289d070de40 Mon Sep 17 00:00:00 2001 From: JarnoVgr Date: Fri, 1 May 2015 11:33:10 +0200 Subject: [PATCH 1/2] Corrected installer version number --- distribution/windows/install.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/windows/install.nsi b/distribution/windows/install.nsi index 7d6432b0a0..c5a3843fd3 100644 --- a/distribution/windows/install.nsi +++ b/distribution/windows/install.nsi @@ -1,7 +1,7 @@ # Version numbers to update !define /ifndef APPV_MAJOR 0 -!define /ifndef APPV_MINOR 2 -!define /ifndef APPV_MAINT 0 +!define /ifndef APPV_MINOR 0 +!define /ifndef APPV_MAINT 2 !define /ifndef APPV_BUILD 0 !define /ifndef APPV_EXTRA "-beta" From ac6a32ba81d7e6f43e3fbd7db9925943d079a003 Mon Sep 17 00:00:00 2001 From: JarnoVgr Date: Fri, 1 May 2015 11:39:00 +0200 Subject: [PATCH 2/2] Add basic support for installer downgrading --- distribution/windows/install.nsi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/distribution/windows/install.nsi b/distribution/windows/install.nsi index c5a3843fd3..3ca2dbd40e 100644 --- a/distribution/windows/install.nsi +++ b/distribution/windows/install.nsi @@ -488,9 +488,14 @@ DoUninstall: ; You have the same version as this installer. This allows you to Quit InstallerIsOlder: - MessageBox MB_OK|MB_ICONSTOP \ - "You have a newer version of ${APPNAME}.$\nSetup will now exit." - Quit + ;MessageBox MB_OK|MB_ICONSTOP \ + ; "You have a newer version of ${APPNAME}.$\nSetup will now exit." + ;Quit + MessageBox MB_OK|MB_ICONSTOP \ + "You have a newer version of ${APPNAME}.$\nPlease note downgrading is currently untested." + MessageBox MB_OK|MB_ICONQUESTION \ + "Welcome to ${APPNAMEANDVERSION} Setup.$\nThis will allow you to downgrade from version $OLDVERSION." + Goto FinishCallback FinishCallback: ClearErrors