diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-31 18:59:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-31 18:59:57 -0400 |
| commit | 54a492db5f86093349910cc0028ff1a56714775f (patch) | |
| tree | 01a858ea5bb9d68dc8eed71efbd435f383269727 /Assistant/WebApp/Configurators/Local.hs | |
| parent | 86fb1305dc623865ef672d499e1559a2608c5be6 (diff) | |
UI for adding a ssh or rsync remote
Diffstat (limited to 'Assistant/WebApp/Configurators/Local.hs')
| -rw-r--r-- | Assistant/WebApp/Configurators/Local.hs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs index 04345f731..beb41e1f1 100644 --- a/Assistant/WebApp/Configurators/Local.hs +++ b/Assistant/WebApp/Configurators/Local.hs @@ -12,13 +12,9 @@ module Assistant.WebApp.Configurators.Local where import Assistant.Common import Assistant.WebApp import Assistant.WebApp.SideBar -import Assistant.DaemonStatus import Assistant.Threads.MountWatcher (handleMount) import Utility.Yesod -import qualified Remote -import qualified Types.Remote as Remote import Remote.List -import Annex.UUID (getUUID) import Init import qualified Git import qualified Git.Construct @@ -102,7 +98,9 @@ defaultRepositoryPath firstrun = do then do desktop <- userDesktopDir ifM (doesDirectoryExist desktop) - (relHome (desktop </> "annex"), return "~/annex") + ( relHome $ desktop </> gitAnnexAssistantDefaultDir + , return $ "~" </> gitAnnexAssistantDefaultDir + ) else return cwd localRepositoryForm :: Form RepositoryPath @@ -178,7 +176,7 @@ getAddDriveR = bootstrap (Just Config) $ do webapp <- getYesod liftIO $ syncrepo dir webapp where - dir = mountpoint </> "annex" + dir = mountpoint </> gitAnnexAssistantDefaultDir remotename = takeFileName mountpoint {- The repo may already exist, when adding removable media - that has already been used elsewhere. -} |