if the webapp is started with a cwd the user can't write to, don't suggest it
Fall back to somewhere under $HOME instead. I had a report that git-annex.app on OSX was coming up with "/" as the suggested location on first run.
This commit is contained in:
parent
1117583087
commit
fede52ac05
1 changed files with 6 additions and 3 deletions
|
@ -90,19 +90,22 @@ checkRepositoryPath p = do
|
|||
{- On first run, if run in the home directory, default to putting it in
|
||||
- ~/Desktop/annex, when a Desktop directory exists, and ~/annex otherwise.
|
||||
-
|
||||
- If run in another directory, the user probably wants to put it there. -}
|
||||
- If run in another directory, that the user can write to,
|
||||
- the user probably wants to put it there. -}
|
||||
defaultRepositoryPath :: Bool -> IO FilePath
|
||||
defaultRepositoryPath firstrun = do
|
||||
cwd <- liftIO $ getCurrentDirectory
|
||||
home <- myHomeDir
|
||||
if home == cwd && firstrun
|
||||
then do
|
||||
then inhome
|
||||
else ifM (canWrite cwd) ( return cwd, inhome )
|
||||
where
|
||||
inhome = do
|
||||
desktop <- userDesktopDir
|
||||
ifM (doesDirectoryExist desktop)
|
||||
( relHome $ desktop </> gitAnnexAssistantDefaultDir
|
||||
, return $ "~" </> gitAnnexAssistantDefaultDir
|
||||
)
|
||||
else return cwd
|
||||
|
||||
newRepositoryForm :: FilePath -> Form RepositoryPath
|
||||
newRepositoryForm defpath msg = do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue