diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-28 19:08:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-28 19:08:13 -0400 |
| commit | edb563a78e51560e8f68d9d61a40f8c4a4963660 (patch) | |
| tree | 0b0f3e2d5627728cbaa9040eca1e570167a48445 /Assistant/Install.hs | |
| parent | d70534eb5733e4669fb3b636397ee7acd76948a1 (diff) | |
standalone linux app nearly ready
also made several fixes that apply to the OSX app
Diffstat (limited to 'Assistant/Install.hs')
| -rw-r--r-- | Assistant/Install.hs | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs index d2bd2c545..9b950ea4b 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -5,6 +5,8 @@ - Licensed under the GNU GPL version 3 or higher. -} +{-# LANGUAGE CPP #-} + module Assistant.Install where import Assistant.Common @@ -12,14 +14,15 @@ import Assistant.Install.AutoStart import Assistant.Ssh import Locations.UserConfig import Utility.FileMode +import Utility.FreeDesktop import Utility.OSX import System.Posix.Env -standaloneOSXAppBase :: IO (Maybe FilePath) -standaloneOSXAppBase = getEnv "GIT_ANNEX_OSX_APP_BASE" +standaloneAppBase :: IO (Maybe FilePath) +standaloneAppBase = getEnv "GIT_ANNEX_APP_BASE" -{- The OSX git-annex.app does not have an installation process. +{- The standalone 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 - git-annex-shell wrapper into ~/.ssh @@ -28,16 +31,21 @@ standaloneOSXAppBase = getEnv "GIT_ANNEX_OSX_APP_BASE" - it around, the paths this sets up won't break. -} ensureInstalled :: IO () -ensureInstalled = go =<< standaloneOSXAppBase +ensureInstalled = go =<< standaloneAppBase where go Nothing = noop go (Just base) = do - let program = base ++ "/bin/git-annex" + let program = base ++ "runshell git-annex" programfile <- programFile createDirectoryIfMissing True (parentDir programfile) writeFile programfile program - autostartfile <- userAutoStart autoStartLabel +#ifdef darwin_HOST_OS + autostartfile <- userAutoStart osxAutoStartLabel +#else + autostartfile <- autoStartPath "git-annex" + <$> userConfigDir +#endif installAutoStart program autostartfile {- This shim is only updated if it doesn't @@ -52,7 +60,7 @@ ensureInstalled = go =<< standaloneOSXAppBase , "exec", base </> "runshell" ++ " git-annex-shell -c \"$SSH_ORIGINAL_COMMAND\"" ] - curr <- catchDefaultIO "" $ readFile shim + curr <- catchDefaultIO "" $ readFileStrict shim when (curr /= content) $ do createDirectoryIfMissing True (parentDir shim) writeFile shim content |