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 5fe18e4118846a6227b963ad54595e1fccb5835f..da930a192d77c6f2cf7f3dc061f59480b8d512a1 100644 (file)
--- 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}