summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-02 07:47:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-02 07:47:39 -0400
commit112ce4f49c95022d1afe83bd31f4af35a01f877c (patch)
tree3929dd9a0d5ec4550239fd57cb4e3415c8076f7b /Assistant
parentadf5789c1b6c80549d28284834b91a1cbddc90c9 (diff)
support XDG_DATA_DIR
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/WebApp/Configurators.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Assistant/WebApp/Configurators.hs b/Assistant/WebApp/Configurators.hs
index 01245b4bc..1c7ea7cf4 100644
--- a/Assistant/WebApp/Configurators.hs
+++ b/Assistant/WebApp/Configurators.hs
@@ -111,8 +111,10 @@ defaultRepositoryPath firstrun = do
cwd <- liftIO $ getCurrentDirectory
home <- myHomeDir
if home == cwd && firstrun
- then ifM (doesDirectoryExist $ home </> "Desktop")
- (return "~/Desktop/annex", return "~/annex")
+ then do
+ desktop <- userDesktopDir
+ ifM (doesDirectoryExist desktop)
+ (relHome (desktop </> "annex"), return "~/annex")
else return cwd
addRepositoryForm :: Form RepositoryPath