[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.1-7-g7f89701

[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  7f8970130d2ac5d4ae49cdf6e6bbdd3e13582823 (commit)
      from  2d086d7a7c4f448d119168677d5233e499cbcd06 (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 7f8970130d2ac5d4ae49cdf6e6bbdd3e13582823
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Dec 6 14:20:23 2017 +0100

    Check for error of gnupg installation
    
    * src/inst-gnupg-w32.nsi: Check for return code of gnupg-w32
    and show an error.
    
    --
    GnuPG-Bug-Id: T3462

diff --git a/src/inst-gnupg-w32.nsi b/src/inst-gnupg-w32.nsi
index ab9bb1f..bc28704 100644
--- a/src/inst-gnupg-w32.nsi
+++ b/src/inst-gnupg-w32.nsi
@@ -35,8 +35,11 @@ ${MementoSection} "GnuPG" SEC_gnupg_w32
 SetOutPath "$TEMP"
   DetailPrint  "$(T_Installing_GnuPG) ${gpg4win_pkg_gnupg_w32_version}"
   File "${prefix}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe"
-  ExecWait '"$TEMP\gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe" /S /D=$INSTDIR\..\GnuPG'
+  ExecWait '"$TEMP\gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe" /S /D=$INSTDIR\..\GnuPG' $0
 
+  IntCmp $0 0 done 0
+  MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_Gpg_Install_failed)"
+done:
   Delete "$TEMP\gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe"
 !endif
 ${MementoSectionEnd}
@@ -46,3 +49,10 @@ LangString T_Installing_GnuPG ${LANG_ENGLISH} \
 
 LangString DESC_SEC_gnupg_w32 ${LANG_ENGLISH} \
    "GNU Privacy Guard"
+
+LangString T_Gpg_Install_failed ${LANG_ENGLISH} \
+   "Failed to install GnuPG.$\r$\n \
+   Gpg4win will not work properly without GnuPG.$\r$\n \
+   Please download and install the simple installer \
+   for GnuPG from:$\r$\n$\r$\n \
+   https://gnupg.org/download"

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

Summary of changes:
 src/inst-gnupg-w32.nsi | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)


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