[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.0-105-g730a2e2

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  730a2e2c47df8b176164c97ecb948971db8fc3d4 (commit)
      from  e42f247def66b2a0509eff0ccaa58cd4cdc93012 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 730a2e2c47df8b176164c97ecb948971db8fc3d4
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Mar 1 11:23:02 2016 +0100

    Fix source installer build
    
    * src/installer.nsi: Fix ifndef SOURCES guard.
    
    --
    The customfunction post was now in context of the sources
    uninstaller welcome page.

diff --git a/src/installer.nsi b/src/installer.nsi
index 2de7f5b..9be22c0 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -155,10 +155,10 @@ Bitte die Sprache des Installations-Vorgangs angeben."
 
 !define MUI_PAGE_CUSTOMFUNCTION_PRE BeforeInstallHooks
 !insertmacro MUI_PAGE_INSTFILES
-!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
-
 # Finish page
 !ifndef SOURCES
+!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
+
 !define MUI_PAGE_CUSTOMFUNCTION_SHOW FinishFunction
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION RunAsUser
@@ -210,7 +210,9 @@ LangString T_RunGPA ${LANG_ENGLISH} \
 
 !insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
+!ifndef SOURCES
 !define MUI_PAGE_CUSTOMFUNCTION_PRE un.CloseApps
+!endif
 !insertmacro MUI_UNPAGE_INSTFILES
 #!insertmacro MUI_UNPAGE_FINISH
 

-----------------------------------------------------------------------

Summary of changes:
 src/installer.nsi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org