summaryrefslogtreecommitdiff
path: root/Command/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-06-30 17:13:08 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-06-30 17:13:08 -0400
commitc8ad8bb11f14673763a5456f470eebf06c5fbb15 (patch)
tree319b52ce4295ed85d1c45988652f47e370d70c18 /Command/Assistant.hs
parentc77f3c72aea18ed9524171a1171205f0cbedc381 (diff)
Run standalone install process when the assistant is started (was only being run when the webapp was opened).
I had thought that this was already done, but apparently not. There may have been a reversion around version 5.20140606. Anna's laptop had its desktop menu file etc having that version despite having upgraded git-annex to a newer version. However, I could not find any commits that removed a call to ensureInstalled.
Diffstat (limited to 'Command/Assistant.hs')
-rw-r--r--Command/Assistant.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index 496df1dd2..8316a9948 100644
--- a/Command/Assistant.hs
+++ b/Command/Assistant.hs
@@ -14,6 +14,7 @@ import Annex.Init
import Config.Files
import qualified Build.SysConfig
import Utility.HumanTime
+import Assistant.Install
import System.Environment
@@ -50,6 +51,7 @@ start foreground stopdaemon autostart startdelay
liftIO $ autoStart startdelay
stop
| otherwise = do
+ liftIO ensureInstalled
ensureInitialized
Command.Watch.start True foreground stopdaemon startdelay