Page MenuHome GnuPG
Files F27672475

No OneTemporary
Actions

View Options

diff --git a/src/inst-gnupg-w32.nsi b/src/inst-gnupg-w32.nsi
index 954ded04..4c420588 100644
--- a/src/inst-gnupg-w32.nsi
+++ b/src/inst-gnupg-w32.nsi
@@ -1,63 +1,63 @@
# 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' $0
IntCmp $0 0 done 0
MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_Gpg_Install_failed)"
done:
- SetOutPath "$INSTDIR\..\GnuPG\bin"
- File /oname=gpg-w32.exe "${BUILD_DIR}/gpgwrap.exe"
- File /oname=gpgsm-w32.exe "${BUILD_DIR}/gpgwrap.exe"
- File /oname=gpgconf-w32.exe "${BUILD_DIR}/gpgwrap.exe"
+# SetOutPath "$INSTDIR\..\GnuPG\bin"
+# File /oname=gpg-w32.exe "${BUILD_DIR}/gpgwrap.exe"
+# File /oname=gpgsm-w32.exe "${BUILD_DIR}/gpgwrap.exe"
+# File /oname=gpgconf-w32.exe "${BUILD_DIR}/gpgwrap.exe"
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"
diff --git a/src/uninst-gnupg-w32.nsi b/src/uninst-gnupg-w32.nsi
index 143f8e1a..bbf72ffb 100644
--- a/src/uninst-gnupg-w32.nsi
+++ b/src/uninst-gnupg-w32.nsi
@@ -1,50 +1,50 @@
# inst-gnupg2.nsi - Uninstaller 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}
# Uninstaller section.
Section "un.gnupg_w32"
!ifdef SOURCES
Push "${gpg4win_pkg_gnupg_w32}"
Call un.SourceDelete
!else
ClearErrors
ReadRegStr $0 SHCTX "Software\GnuPG" "Install Directory"
IfErrors gnupg_w32_not_installed 0
# It is possible that someone uninstalled gnupg without uninstalling
# gpg4win
StrCmp $0 "" gnupg_w32_not_installed
DetailPrint "$(T_Uninstalling_GnuPG) ${gpg4win_pkg_gnupg_w32_version}"
- Delete "$0\bin\gpg-w32.exe"
- Delete "$0\bin\gpgsm-w32.exe"
- Delete "$0\bin\gpgconf-w32.exe"
+ #Delete "$0\bin\gpg-w32.exe"
+ #Delete "$0\bin\gpgsm-w32.exe"
+ #Delete "$0\bin\gpgconf-w32.exe"
ExecWait '"$0\gnupg-uninstall.exe" /S _?=$0'
Delete /REBOOTOK "$0\gnupg-uninstall.exe"
RmDir "$0"
gnupg_w32_not_installed:
!endif
SectionEnd
LangString T_UnInstalling_GnuPG ${LANG_ENGLISH} \
"Uninstalling GnuPG"

File Metadata

Mime Type
text/x-diff
Expires
Tue, Sep 16, 12:46 AM (14 h, 45 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f0/b2/55fbef640b24b2acdf8e8e1c8584

Event Timeline