[Gpg4win-commits] r228 - in trunk: . doc/manual-de packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Mar 17 21:02:47 CET 2006
Author: werner
Date: 2006-03-17 21:02:46 +0100 (Fri, 17 Mar 2006)
New Revision: 228
Added:
trunk/doc/manual-de/sc-gpgol-icons-es.png
trunk/doc/manual-de/sc-gpgol-menu-es.png
Modified:
trunk/NEWS
trunk/doc/manual-de/einsteiger.tex
trunk/packages/packages.current
trunk/src/inst-sections.nsi
trunk/src/installer.nsi
Log:
Detects simsial projects.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-03-17 01:21:34 UTC (rev 227)
+++ trunk/NEWS 2006-03-17 20:02:46 UTC (rev 228)
@@ -1,3 +1,12 @@
+Noteworthy changes in version
+------------------------------------------------
+
+ * Shows a warning if an existing installation of GnuPP or GnuPT is
+ found. Rejects installation if GnuPG-Pack is installed.
+
+ * The Einsteiger manual features a section on GPGol.
+
+
Noteworthy changes in version 0.8.0 (2006-03-09)
------------------------------------------------
Modified: trunk/doc/manual-de/einsteiger.tex
===================================================================
--- trunk/doc/manual-de/einsteiger.tex 2006-03-17 01:21:34 UTC (rev 227)
+++ trunk/doc/manual-de/einsteiger.tex 2006-03-17 20:02:46 UTC (rev 228)
@@ -1345,7 +1345,7 @@
Alle Optionen sind nach einer Neuinstallation bereits sinnvoll vorbelegt. Um
aber verschlüsselte Nachrichten versenden zu können, sollten Sie
-sicherstellen, dass Sie nicht Microsoft Word zum Verfassen der
+sicherstellen, daß Sie \textbf{nicht Microsoft Word zum Verfassen} der
Nachrichten benutzen. Desweiteren ist dringend anzuraten auf HTML
Nachrichten zu verzichten.
@@ -1372,6 +1372,9 @@
verschiebt es in die Symbolleiste. Dasselbe gilt für das Icon zum
Aufruf der Schlüsselverwaltung.
+ Achten Sie auch darauf, daß Sie nicht Microsoft Word zum Verfassen
+ von Nachrichten benuzten. Siehe Installationsanleitung.
+
\item[Was bedeuten die Buchstaben im Übersichtsdialog?]
Bei der Entschlüsselung oder Signaturprüfung von Nachrichten mit
Added: trunk/doc/manual-de/sc-gpgol-icons-es.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/manual-de/sc-gpgol-icons-es.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/manual-de/sc-gpgol-menu-es.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/manual-de/sc-gpgol-menu-es.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2006-03-17 01:21:34 UTC (rev 227)
+++ trunk/packages/packages.current 2006-03-17 20:02:46 UTC (rev 228)
@@ -16,7 +16,7 @@
# delimiter). The statement "chk" is followed by the SHA1 checksum of
# the last file.
#
-# Note: You may use "make upload" to copy this file to is canocnical place.
+# Note: You may use "make upload" to copy this file to its canonical place.
#
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2006-03-17 01:21:34 UTC (rev 227)
+++ trunk/src/inst-sections.nsi 2006-03-17 20:02:46 UTC (rev 228)
@@ -375,6 +375,7 @@
; Note that we delete gpgspltmp.wav in .onInst{Failed,Success}
Call CalcDepends
+ Call CheckOtherGnuPGApps
FunctionEnd
@@ -391,26 +392,27 @@
FunctionEnd
+# Note used anymore:
# This function is run from the finish page.
-Function RunOnFinish
-!ifdef HAVE_PKG_GPA
- SectionGetFlags ${SEC_gpa} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_gpa_avail
- Exec "$INSTDIR\gpa.exe"
- Return
- no_gpa_avail:
-!endif
-!ifdef HAVE_PKG_WINPT
- SectionGetFlags ${SEC_winpt} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_winpt_avail
- Exec "$INSTDIR\WinPT.exe --keymanager"
- Return
- no_winpt_avail:
-!endif
- MessageBox MB_OK "$(T_NoKeyManager)"
-FunctionEnd
+#Function RunOnFinish
+#!ifdef HAVE_PKG_GPA
+# SectionGetFlags ${SEC_gpa} $R0
+# IntOp $R0 $R0 & ${SF_SELECTED}
+# IntCmp $R0 ${SF_SELECTED} 0 no_gpa_avail
+# Exec "$INSTDIR\gpa.exe"
+# Return
+# no_gpa_avail:
+#!endif
+#!ifdef HAVE_PKG_WINPT
+# SectionGetFlags ${SEC_winpt} $R0
+# IntOp $R0 $R0 & ${SF_SELECTED}
+# IntCmp $R0 ${SF_SELECTED} 0 no_winpt_avail
+# Exec "$INSTDIR\WinPT.exe --keymanager"
+# Return
+# no_winpt_avail:
+#!endif
+# MessageBox MB_OK "$(T_NoKeyManager)"
+#FunctionEnd
# This must be in a central place. Urgs.
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2006-03-17 01:21:34 UTC (rev 227)
+++ trunk/src/installer.nsi 2006-03-17 20:02:46 UTC (rev 228)
@@ -81,6 +81,8 @@
VIAddVersionKey "FileDescription" "${DESCRIPTION}"
VIAddVersionKey "FileVersion" "${PROD_VERSION}"
+# Set to the name of another GnupG installation if one has been detected
+Var OtherGnuPGDetected
# Interface Settings
@@ -123,6 +125,7 @@
!define MUI_PAGE_CUSTOMFUNCTION_PRE PrintCloseOtherApps
!insertmacro MUI_PAGE_INSTFILES
+!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
!define MUI_FINISHPAGE_SHOWREADME "README.$(T_LangCode).txt"
!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(T_ShowReadme)"
#!define MUI_FINISHPAGE_RUN
@@ -223,12 +226,62 @@
# Custom functions and macros for gpg4win.
!include "g4wihelp.nsi"
+
+# Display a warning if GnuPP has been detected and allow the user to abort
+# the installation.
+Function PrintGnuPPWarning
+ MessageBox MB_YESNO "$(T_FoundOldGnuPP)" IDYES cont
+ Abort
+ cont:
+ StrCpy $OtherGnuPGDetected "GnuPP"
+FunctionEnd
+
+# Display a warning if GnuPT has been detected and allow the user to abort
+# the installation.
+Function PrintGnuPTWarning
+ MessageBox MB_YESNO "$(T_FoundOldGnuPT)" IDYES cont
+ Abort
+ cont:
+ StrCpy $OtherGnuPGDetected "GnuPT"
+FunctionEnd
+
+# Display a warning if GnuPG Pack has been detected and abort the
+# the installation. This one clobbers our own Registry space.
+Function PrintGnuPackWarning
+ MessageBox MB_OK "$(T_FoundOldGnuPack)"
+ Abort
+FunctionEnd
+
+
+# Check whether one of the other GnuPG systems has already been
+# installed. We do this by looking at the registry.
+Function CheckOtherGnuPGApps
+ StrCpy $OtherGnuPGDetected ""
+ ClearErrors
+ ReadRegStr $0 HKLM "Software\GNU\GnuPP\Settings" "Path"
+ IfErrors +2 0
+ Call PrintGnuPPWarning
+
+ EnumRegKey $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\MenuOrder\Start Menu\Programs\GnuPT" 0
+ StrCmp $0 "" +2
+ Call PrintGnuPTWarning
+
+ ReadRegStr $0 HKLM "Software\GNU\GnuPG" "Install Directory"
+ Push $0
+ Push "GnuPG-Pack"
+ Call StrStr
+ Pop $0
+ StrCmp $0 "" +2
+ Call PrintGnuPackWarning
+
+FunctionEnd
+
+
# PrintNonAdminWarning
# Check whether the current user is in the Administrator group or an
# OS version without the need for an Administrator is in use. Print a
# warning if this is not the case.
-
Function PrintNonAdminWarning
ClearErrors
UserInfo::GetName
@@ -259,7 +312,66 @@
leave:
FunctionEnd
+# Called right before the final page to show more warnings.
+Function ShowFinalWarnings
+ StrCmp $OtherGnupgDetected "" +2
+ MessageBox MB_OK "$(T_FoundOldSeeManual)"
+ leave:
+FunctionEnd
+#---------------------------------------------
+# From the old installation checking functions
+#---------------------------------------------
+LangString T_FoundOldSeeManual ${LANG_ENGLISH} \
+ "Please see the Gpg4win manual to learn how to migrate existing \
+ keys from other GnuPG based installations to Gpg4win."
+LangString T_FoundOldSeeManual ${LANG_GERMAN} \
+ "Bitte sehen Sie im Gpg4win für Durchblicker Handbuch nach, wie Sie \
+ Schlüssel aus anderen - GnuPG basierten - Installationen in Gpg4win \
+ überführen."
+
+#---------
+LangString T_FoundOldGnuPP ${LANG_ENGLISH} \
+ "An old installation of GnuPP (GNU Privacy Project) has been been \
+ detected. That software is not maintained anymore and thus should \
+ be removed. \
+ \
+ Do you want to continue installing Gpg4win and take care of the old \
+ installation later?"
+LangString T_FoundOldGnuPP ${LANG_GERMAN} \
+ "Eine alte Installation von GnuPP (GNU Privacy Project) wurde gefunden. \
+ Diese Software wird nicht mehr gepflegt und sollte deshalb vom \
+ System entfernt werden. \
+ \
+ Möchten Sie die Installation von Gpg4win weiter durchführen und sich \
+ dann später um die Entfernung von GnuPP kümmern?"
+
+#---------
+LangString T_FoundOldGnuPT ${LANG_ENGLISH} \
+ "An installation of GnuPT has been been detected. This may cause \
+ problems when used along with Gpg4win. \
+ \
+ Do you want to continue installing Gpg4win?"
+LangString T_FoundOldGnuPT ${LANG_GERMAN} \
+ "Eine Installation von GnuPT wurde gefunden. Dies kann zu Problemen \
+ führen, falls GnuPT zusammem mit Gpg4win benutzt wird. \r\n\r\n \
+ Möchten Sie die Installation von Gpg4win fortführen?"
+
+#--------
+LangString T_FoundOldGnuPack ${LANG_ENGLISH} \
+ "An installation of GnuPG-Pack has been been detected. You need to \
+ uninstall it before you can continue with Gpg4win installation. \
+ \
+ The installation will be aborted now!"
+LangString T_FoundOldGnuPack ${LANG_GERMAN} \
+ "Eine Installation con GnuPG-Pack wurde gefunden. Sie müssen diese \
+ zuerst deinstallieren bevor Sie mit der Installation von Gpg4win \
+ fortfahren können. \
+ \
+ Die Installation von Gpg4win wird nun abgebrochen!"
+
+
+
# From Function PrintNonAdminWarning
LangString T_AdminNeeded ${LANG_ENGLISH} \
"Warning: Administrator permissions required for a successful installation"
@@ -313,3 +425,46 @@
Pop $R0
Delete "$INSTDIR\$R0"
FunctionEnd
+
+
+# StrStr - taken from the NSIS reference
+# input, top of stack = string to search for
+# top of stack-1 = string to search in
+# output, top of stack (replaces with the portion of the string remaining)
+# modifies no other variables.
+#
+# Usage:
+# Push "this is a long ass string"
+# Push "ass"
+# Call StrStr
+# Pop $R0
+# ($R0 at this point is "ass string")
+#
+Function StrStr
+ Exch $R1 # st=haystack,old$R1, $R1=needle
+ Exch # st=old$R1,haystack
+ Exch $R2 # st=old$R1,old$R2, $R2=haystack
+ Push $R3
+ Push $R4
+ Push $R5
+ StrLen $R3 $R1
+ StrCpy $R4 0
+ # $R1=needle
+ # $R2=haystack
+ # $R3=len(needle)
+ # $R4=cnt
+ # $R5=tmp
+ loop:
+ StrCpy $R5 $R2 $R3 $R4
+ StrCmp $R5 $R1 done
+ StrCmp $R5 "" done
+ IntOp $R4 $R4 + 1
+ Goto loop
+ done:
+ StrCpy $R1 $R2 "" $R4
+ Pop $R5
+ Pop $R4
+ Pop $R3
+ Pop $R2
+ Exch $R1
+FunctionEnd
More information about the Gpg4win-commits
mailing list