summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/NullSoftInstaller.hs2
-rw-r--r--doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn10
2 files changed, 9 insertions, 3 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index d097519d5..908da352c 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -85,7 +85,7 @@ makeInstaller gitannex license extrafiles = nsis $ do
{- Installing into the same directory as git avoids needing to modify
- path myself, since the git installer already does it. -}
installDir gitInstallDir
- requestExecutionLevel User
+ requestExecutionLevel Admin
iff (fileExists gitInstallDir)
(return ())
diff --git a/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn b/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn
index b36d5e84c..4c07478dd 100644
--- a/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn
+++ b/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn
@@ -1,6 +1,8 @@
### Please describe the problem.
-Installing on Windows requires installing git followed by git-annex. Installing the former works without admin rights, but the latter cannot be installed afterwards.
+Installing on Windows requires installing git followed by git-annex.
+Installing the former works without admin rights, but the latter cannot be
+installed afterwards.
### What steps will reproduce the problem?
@@ -15,5 +17,9 @@ Latest release on MS Windows.
### Please provide any additional information below.
-Installing git creates read-only directories that cannot be used by the git-annex install afterwards. Without admin rights, the read-only flag of the git dir cannot be altered.
+Installing git creates read-only directories that cannot be used by the
+git-annex install afterwards. Without admin rights, the read-only flag of
+the git dir cannot be altered.
+> I've made the installer now request admin rights if run by a non-admin
+> Hopefully good enough. [[done]] --[[Joey]]