commit 84863eb1b03de97b8445f6cfa633e361a4d7f769 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Thu Mar 21 02:45:21 2019 +0100
installer/setup/configure.nsh: revert an unwanted commit part --- .../Win32/packaging/installer/setup/configure.nsh | 24 -------------------- 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 7fc6a32..97bc945 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -233,30 +233,6 @@ Var ConfigureReturn Section -ConfigureScript - SetOutPath "$INSTDIR\Resources" - - # ask to update MiKTeX - ${if} $LaTeXInstalled == "MiKTeX" - Call UpdateMiKTeX # function from latex.nsh - # install all necessary packages at once because this is much faster then to install the packages one by one - DetailPrint $(TEXT_CONFIGURE_LYX) - ${if} $MultiUser.Privileges != "Admin" - ${andif} $MultiUser.Privileges != "Power" - # call the non-admin version - # at first we need to synchronize the package database - nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"' - nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"' - ${else} - ${if} $MiKTeXUser != "HKCU" # call the admin version - nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--update-db"' - nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"' - ${else} - nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"' - nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--require=@$INSTDIR\Resources\Packages.txt"' - ${endif} - ${endif} - ${endif} - DetailPrint $(TEXT_CONFIGURE_LYX) nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"' # $ConfigureReturn is "0" if successful, otherwise "1"