Page MenuHome GnuPG
Files F37954737

No OneTemporary
Actions

View Options

diff --git a/src/inst-gnupg-w32.nsi b/src/inst-gnupg-w32.nsi
index ab9bb1f2..bc28704d 100644
--- a/src/inst-gnupg-w32.nsi
+++ b/src/inst-gnupg-w32.nsi
@@ -1,48 +1,58 @@
# inst-gnupg2.nsi - Installer snippet for gnupg-w32. -*- coding: latin-1; -*-
# Copyright (C) 2015 Intevation GmbH
#
# This file is part of Gpg4win.
#
# Gpg4win is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# Gpg4win is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA.
!ifdef prefix
!undef prefix
!endif
!define prefix ${ipdir}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}
!define source ${bpdir}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}
${MementoSection} "GnuPG" SEC_gnupg_w32
SectionIn RO
!ifdef SOURCES
SetOutPath "$INSTDIR"
File "${gpg4win_pkg_gnupg_w32}"
!else
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}
LangString T_Installing_GnuPG ${LANG_ENGLISH} \
"Installing GnuPG"
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"

File Metadata

Mime Type
text/x-diff
Expires
Thu, Mar 19, 6:02 PM (15 h, 32 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
0a/34/d348f12a61cdaff5693c3bff01ed

Event Timeline