From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 26 Apr 2010 23:47:20 +0000 (+0000)
Subject: installer: detect JabRef 2.6, drop support for JabRef 2.2
X-Git-Tag: 2.0.0~3341
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d4dca29275fa8a880e452ecadacd25ac717e9913;p=features.git

installer: detect JabRef 2.6, drop support for JabRef 2.2

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34298 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
index 5156b2feba..31e1c5d6a8 100644
--- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
+++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
@@ -136,10 +136,7 @@ Function MissingPrograms
 
   # test if the BibTeX-editor JabRef is installed
   StrCpy $BibTeXEditorPath ""
-  ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.2" "UninstallString"
-  ${if} $BibTeXEditorPath == ""
-   ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.3" "UninstallString"
-  ${endif}
+  ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.3" "UninstallString"
   ${if} $BibTeXEditorPath == ""
    ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.3.1" "UninstallString"
   ${endif}
@@ -155,6 +152,9 @@ Function MissingPrograms
   ${if} $BibTeXEditorPath == ""
    ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.5" "UninstallString"
   ${endif}
+  ${if} $BibTeXEditorPath == ""
+   ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.6" "UninstallString"
+  ${endif}
   
   # test if Inkscape is installed
   ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation"