Don't pass --admin flag if this is a private user setup (#53)

MiKTeX · Feb 1, 2018 · da146a1 · da146a1
1 parent dbbb94c
commit da146a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Libraries/MiKTeX/Setup/SetupService.cpp b/Libraries/MiKTeX/Setup/SetupService.cpp
@@ -632,6 +632,10 @@ void SetupServiceImpl::CompleteOptions(bool allowRemoteCalls)
 {
   shared_ptr<Session> session = Session::Get();
 
+  if (options.Task == SetupTask::FinishUpdate || options.Task == SetupTask::CleanUp)
+  {
+    options.IsCommonSetup = session->IsSharedSetup();
+  }
   if (options.Task == SetupTask::CleanUp)
   {
     options.Config.commonInstallRoot = session->GetSpecialPath(SpecialPath::CommonInstallRoot);

diff --git a/Libraries/MiKTeX/Setup/version.cmake b/Libraries/MiKTeX/Setup/version.cmake
@@ -17,5 +17,5 @@
 ## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-set(MIKTEX_COMP_J2000_VERSION 6600)
+set(MIKTEX_COMP_J2000_VERSION 6606)
 set(MIKTEX_COMP_INTERFACE_VERSION 2)