diff --git a/src/inst-gpa.nsi b/src/inst-gpa.nsi index 25ffa294..8a76bf64 100644 --- a/src/inst-gpa.nsi +++ b/src/inst-gpa.nsi @@ -1,87 +1,89 @@ # inst-gpa.nsi - Installer snippet for gpa. -*- coding: latin-1; -*- # Copyright (C) 2005, 2008 g10 Code 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA !ifdef prefix !undef prefix !endif !define prefix ${ipdir}/gpa-${gpg4win_pkg_gpa_version} !ifdef GPG4WIN_VANILLA ${MementoUnselectedSection} "GPA" SEC_gpa !else !ifdef GPG4WIN_LIGHT ${MementoSection} "GPA" SEC_gpa !else ${MementoUnselectedSection} "GPA" SEC_gpa !endif !endif SetOutPath "$INSTDIR" !ifdef SOURCES File "${gpg4win_pkg_gpa}" !else SetOutPath "$INSTDIR\bin" File ${prefix}/bin/gpa.exe + File ${ipdir}/pinentry-${gpg4win_pkg_pinentry_version}/bin/pinentry-gtk-2.exe + SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES" File ${prefix}/share/locale/de/LC_MESSAGES/gpa.mo SetOutPath "$INSTDIR\share\locale\ar\LC_MESSAGES" File ${prefix}/share/locale/ar/LC_MESSAGES/gpa.mo SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES" File ${prefix}/share/locale/es/LC_MESSAGES/gpa.mo SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES" File ${prefix}/share/locale/fr/LC_MESSAGES/gpa.mo SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES" File ${prefix}/share/locale/ru/LC_MESSAGES/gpa.mo SetOutPath "$INSTDIR\share\gpa" File /nonfatal ${prefix}/share/gpa/gpa-logo.ppm File ${prefix}/share/gpa/gpa.png # If requested, install the configuration files. ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData StrCmp $0 "" no_config_gpa_files CreateDirectory "$0\gnupg" g4wihelp::config_fetch "gpa.conf" StrCmp $R0 "" no_config_gpa_conf CopyFiles $R0 "$0\gnupg\gpa.conf" no_config_gpa_conf: no_config_gpa_files: WriteRegStr SHCTX "Software\Gpg4win\gpa\Capabilities" "ApplicationDescription" "$(DESC_SEC_gpa)" WriteRegStr SHCTX "Software\Gpg4win\gpa\Capabilities" "ApplicationIcon" "$INSTDIR\bin\gpa.exe,0" WriteRegStr SHCTX "Software\Gpg4win\gpa\Capabilities" "ApplicationName" "$(DESC_SEC_gpa)" !endif ${MementoSectionEnd} LangString DESC_SEC_gpa ${LANG_ENGLISH} \ "GNU Privacy Assistant" LangString DESC_Menu_gpa ${LANG_ENGLISH} \ "Run the GNU Privacy Assistant key management tool." diff --git a/src/inst-pinentry.nsi b/src/inst-pinentry.nsi index ec826a51..665913d1 100644 --- a/src/inst-pinentry.nsi +++ b/src/inst-pinentry.nsi @@ -1,66 +1,48 @@ # inst-pinentry.nsi - Installer snippet. -*- coding: latin-1; -*- # Copyright (C) 2007 g10 Code 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}/pinentry-${gpg4win_pkg_pinentry_version} !ifdef DEBUG Section "Pinentry" SEC_pinentry !else Section "-Pinentry" SEC_pinentry !endif SetOutPath "$INSTDIR" !ifdef SOURCES File "${gpg4win_pkg_pinentry}" !else SetOutPath "$INSTDIR\bin" File "${prefix}/bin/pinentry-w32.exe" -!ifdef GPG4WIN_VANILLA - File /oname=pinentry.exe "${prefix}/bin/pinentry-w32.exe" -!else - File "${prefix}/bin/pinentry-gtk-2.exe" - -!ifndef GPG4WIN_LIGHT -!ifdef HAVE_PKG_QTBASE - File "${prefix}/bin/pinentry-qt.exe" - # If Qt is installed (usually by selecting kleopatra), we want - # the Qt pinentry as well. Otherwise punt to gtk pinentry, - # which is always available. - !insertmacro SectionFlagIsSet ${SEC_qtbase} \ - ${SF_SELECTED} inst_pinentry_have_qt inst_pinentry_skip_qt - inst_pinentry_have_qt: File /oname=pinentry.exe "${prefix}/bin/pinentry-qt.exe" Goto inst_pinentry_done inst_pinentry_skip_qt: -!endif -!endif - File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe" -!endif inst_pinentry_done: !endif SectionEnd diff --git a/src/uninst-gpa.nsi b/src/uninst-gpa.nsi index 0eac5f88..8842d304 100644 --- a/src/uninst-gpa.nsi +++ b/src/uninst-gpa.nsi @@ -1,75 +1,76 @@ # uninst-gpa.nsi - Installer snippet for gpa. -*- coding: latin-1; -*- # Copyright (C) 2005, 2008 g10 Code 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA !ifdef prefix !undef prefix !endif !define prefix ${ipdir}/gpa-${gpg4win_pkg_gpa_version} ; Uninstaller section. Section "-un.gpa" !ifdef SOURCES Push "${gpg4win_pkg_gpa}" Call un.SourceDelete !else Delete /REBOOTOK "$INSTDIR\bin\gpa.exe" + Delete /REBOOTOK "$INSTDIR\bin\pinentry-gtk-2.exe" Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gpa.mo" Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gpa.mo" Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gpa.mo" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gpa.mo" Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gpa.mo" Delete "$INSTDIR\share\gpa\gpa_tips.en" Delete "$INSTDIR\share\gpa\gpa_tips.de" Delete "$INSTDIR\share\gpa\gpa-logo.ppm" Delete "$INSTDIR\share\gpa\gpa.png" RMDir "$INSTDIR\share\gpa" DeleteRegKey SHCTX "Software\Classes\gpg4win.AssocFile.gpa.GPG" DeleteRegKey SHCTX "Software\Classes\gpg4win.AssocFile.gpa.ASC" DeleteRegKey SHCTX "Software\Classes\gpg4win.AssocFile.gpa.CMS" DeleteRegKey SHCTX "Software\Classes\gpg4win.AssocFile.gpa.X509" DeleteRegKey SHCTX "Software\Classes\gpg4win.AssocFile.gpa.PGPSIG" DeleteRegKey SHCTX "Software\Classes\gpg4win.AssocFile.gpa.PGPKEY" DeleteRegKey SHCTX "Software\Gpg4win\gpa" DeleteRegValue SHCTX "Software\RegisteredApplications" "Gpg4win.gpa" DeleteRegValue SHCTX "Software\Classes\.gpg" "gpg4win.AssocFile.gpa.GPG" DeleteRegValue SHCTX "Software\Classes\.asc" "gpg4win.AssocFile.gpa.ASC" DeleteRegValue SHCTX "Software\Classes\.pgp" "gpg4win.AssocFile.gpa.PGP" DeleteRegValue SHCTX "Software\Classes\.pem" "gpg4win.AssocFile.gpa.CMS" DeleteRegValue SHCTX "Software\Classes\.p7s" "gpg4win.AssocFile.gpa.CMS" DeleteRegValue SHCTX "Software\Classes\.p7m" "gpg4win.AssocFile.gpa.CMS" DeleteRegValue SHCTX "Software\Classes\.arl" "gpg4win.AssocFile.gpa.CMS" DeleteRegValue SHCTX "Software\Classes\.crl" "gpg4win.AssocFile.gpa.CMS" DeleteRegKey /ifempty SHCTX "Software\Classes\.gpg" DeleteRegKey /ifempty SHCTX "Software\Classes\.asc" DeleteRegKey /ifempty SHCTX "Software\Classes\.pgp" DeleteRegKey /ifempty SHCTX "Software\Classes\.sig" DeleteRegKey /ifempty SHCTX "Software\Classes\.pem" DeleteRegKey /ifempty SHCTX "Software\Classes\.p7m" DeleteRegKey /ifempty SHCTX "Software\Classes\.p7s" DeleteRegKey /ifempty SHCTX "Software\Classes\.crl" DeleteRegKey /ifempty SHCTX "Software\Classes\.arl" !endif SectionEnd