summaryrefslogtreecommitdiff
path: root/Assistant/Install.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-27 16:47:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-27 16:47:52 -0400
commit5c94c1d8e3246cf71412c530e05ca92cc0c3cb3c (patch)
tree671416a35d057d22384bbd2d51578bf3f9c937ea /Assistant/Install.hs
parent920704f82167b6b1e0f512fa8d83d5e477a62ccc (diff)
Add OSX standalone app license bundle, and arrange for the About page
to link to it.
Diffstat (limited to 'Assistant/Install.hs')
-rw-r--r--Assistant/Install.hs12
1 files changed, 7 insertions, 5 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index 72a511736..d2bd2c545 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -16,6 +16,9 @@ import Utility.OSX
import System.Posix.Env
+standaloneOSXAppBase :: IO (Maybe FilePath)
+standaloneOSXAppBase = getEnv "GIT_ANNEX_OSX_APP_BASE"
+
{- The OSX git-annex.app does not have an installation process.
- So when it's run, it needs to set up autostarting of the assistant
- daemon, as well as writing the programFile, and putting a
@@ -25,11 +28,10 @@ import System.Posix.Env
- it around, the paths this sets up won't break.
-}
ensureInstalled :: IO ()
-ensureInstalled = do
- e <- getEnv "GIT_ANNEX_OSX_APP_BASE"
- case e of
- Nothing -> return ()
- Just base -> do
+ensureInstalled = go =<< standaloneOSXAppBase
+ where
+ go Nothing = noop
+ go (Just base) = do
let program = base ++ "/bin/git-annex"
programfile <- programFile
createDirectoryIfMissing True (parentDir programfile)