From: Uwe Stöhr <uwestoehr@web.de>
Date: Tue, 10 Nov 2009 22:13:09 +0000 (+0000)
Subject: installer: sync with branch
X-Git-Tag: 2.0.0~5181
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2139ac2cf0204d1da451571137a4c4b135fba5b4;p=features.git

installer: sync with branch

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

diff --git a/development/Win32/packaging/AltInstaller/LaTeX.nsh b/development/Win32/packaging/AltInstaller/LaTeX.nsh
index 5fe18e4118..da930a192d 100644
--- a/development/Win32/packaging/AltInstaller/LaTeX.nsh
+++ b/development/Win32/packaging/AltInstaller/LaTeX.nsh
@@ -218,9 +218,15 @@ Function UpdateMiKTeX
    UpdateNow:
     StrCpy $0 $LaTeXPath -4 # remove "\bin"
     # the update wizard is either started by the copystart.exe or the copystart_admin.exe
-    # the latter replaces copystart.exe since miktex-2.6.2742
+    # (the latter replaces copystart.exe since miktex-2.6.2742) or the miktex-update.exe
+    # (since MiKTeX 2.8)
     ExecWait '"$LaTeXPath\copystart.exe" "$0\config\update.dat"' # run MiKTeX's update wizard
     ExecWait '"$LaTeXPath\copystart_admin.exe" "$0\config\update.dat"' # run MiKTeX's update wizard
+    ${if} $MiKTeXUser != "HKCU" # call the admin version when the user is admin
+     ExecWait '"$LaTeXPath\internal\miktex-update_admin.exe"' # run MiKTeX's update wizard
+    ${else} 
+     ExecWait '"$LaTeXPath\internal\miktex-update.exe"' # run MiKTeX's update wizard
+    ${endif} 
    UpdateLater:
   ${endif}