installer: 2 fixes

- LaTeX.nsh: assure that if MiKTeX is installed for all users also the missing packages will be installed during the configuration for all users
- configure.nsh: run configure.py twice to assure that really all missing packages are checked/installed

diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh
index ec92402445a882ccb6bd7f17f894bc6e08d9bc2b..1acdd66569693ad66f7e3ac82a87e414775bbbc2 100644 (file)
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -242,14 +242,18 @@ Function ConfigureMiKTeX
  ${endif} # end if $PathLaTeX != ""
   
   # enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first)
-  WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" # if only for current user
-  ${if} $MiKTeXUser != "HKCU"
+  ${if} $MiKTeXUser == "HKCU" # if only for current user
+   WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
+  ${else}
    WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
+   # we need to state that missing packages should be installed for all users too
+   WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoAdmin" "t"
   ${endif}
   # set package repository (MiKTeX's primary package repository)
-  WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" # if only for current user
-  WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" # if only for current user
-  ${if} $MiKTeXUser != "HKCU"
+  ${if} $MiKTeXUser == "HKCU" # if only for current user
+   WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" 
+   WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
+  ${else}
    WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}"
    WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
   ${endif}

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 06b250d9f52a48b9f115b2305fcf4865604ccf50..1c1446f9f7456a891b96f274873342740596e3b0 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -201,12 +201,11 @@ Section -ConfigureScript
   # ask to update MiKTeX
   ${if} $LaTeXInstalled == "MiKTeX"
    Call UpdateMiKTeX # function from latex.nsh
-   # for new installations a second run is necessary to give the users feedback about
-   # the ongoing installation of LaTeX packages
+   # especially for new installations a second run is necessary to install all missing package
+   # the reason for this is unknown, most probably it is a timeout problem, because with a fast
+   # Internet connection one run is sometimes sufficient
    # a new installed MiKTeX needs some time until it is ready to install packages
-   !if ${SETUPTYPE} == BUNDLE
-    nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
-   !endif # end if == BUNDLE
+   nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
   ${endif}
 
 SectionEnd