diff options
| -rw-r--r-- | Assistant/Install.hs | 45 | ||||
| -rw-r--r-- | Build/InstallDesktopFile.hs | 59 | ||||
| -rw-r--r-- | Command/WebApp.hs | 2 | ||||
| -rw-r--r-- | Setup.hs | 2 | ||||
| -rw-r--r-- | Utility/OSX.hs | 43 | ||||
| -rwxr-xr-x | ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp | 8 |
6 files changed, 117 insertions, 42 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs new file mode 100644 index 000000000..efcfbfe6e --- /dev/null +++ b/Assistant/Install.hs @@ -0,0 +1,45 @@ +{- Assistant installation + - + - Copyright 2012 Joey Hess <joey@kitenet.net> + - + - Licensed under the GNU GPL version 3 or higher. + -} + +module Assistant.Install where + +import Locations.UserConfig +import Utility.OSX +import Utility.Path + +import System.Posix.Env +import System.Directory + +{- 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. + - + - Note that this is done every time it's started, so if the user moves + - it around, the paths this sets up won't break. + -} +ensureInstalled :: IO () +ensureInstalled = do + e <- getEnv "OSX_GIT_ANNEX_APP_PROGRAM" + case e of + Nothing -> return () + Just program -> do + programfile <- programFile + createDirectoryIfMissing True (parentDir programfile) + writeFile programfile program + + autostartfile <- userAutoStart autoStartLabel + installAutoStart program autostartfile + +{- Installs an autostart plist file for OSX. -} +installAutoStart :: FilePath -> FilePath -> IO () +installAutoStart command file = do + createDirectoryIfMissing True (parentDir file) + writeFile file $ genOSXAutoStartFile autoStartLabel command + ["assistant", "--autostart"] + +autoStartLabel :: String +autoStartLabel = "com.branchable.git-annex.assistant" diff --git a/Build/InstallDesktopFile.hs b/Build/InstallDesktopFile.hs index 9e4229024..70c0033ee 100644 --- a/Build/InstallDesktopFile.hs +++ b/Build/InstallDesktopFile.hs @@ -15,13 +15,13 @@ import Utility.FreeDesktop import Utility.Path import Utility.Monad import Locations.UserConfig +import Utility.OSX +import Assistant.OSX import Control.Applicative -import Control.Monad import System.Directory import System.Environment import System.Posix.User -import System.Posix.Types import System.Posix.Files import System.FilePath @@ -46,7 +46,7 @@ autostart command = genDesktopEntry isRoot :: IO Bool isRoot = do uid <- fromIntegral <$> getRealUserID - return $ uid == 0 + return $ uid == (0 :: Int) inDestDir :: FilePath -> IO FilePath inDestDir f = do @@ -63,29 +63,19 @@ writeFDODesktop command = do writeDesktopMenuFile (autostart command) =<< inDestDir (autoStartPath "git-annex" configdir) - ifM isRoot - ( return () - , do - programfile <- inDestDir =<< programFile - createDirectoryIfMissing True (parentDir programfile) - writeFile programfile command - ) - writeOSXDesktop :: FilePath -> IO () writeOSXDesktop command = do - home <- myHomeDir - - let base = "Library" </> "LaunchAgents" </> label ++ ".plist" - autostart <- ifM isRoot ( inDestDir $ "/" </> base , inDestDir $ home </> base) - createDirectoryIfMissing True (parentDir autostart) - writeFile autostart $ genOSXAutoStartFile label command + installAutoStart command =<< inDestDir =<< ifM isRoot + ( return $ systemAutoStart autoStartLabel + , userAutoStart autoStartLabel + ) + {- Install the OSX app in non-self-contained mode. -} let appdir = "git-annex.app" installOSXAppFile appdir "Contents/Info.plist" Nothing installOSXAppFile appdir "Contents/Resources/git-annex.icns" Nothing installOSXAppFile appdir "Contents/MacOS/git-annex-webapp" (Just webappscript) where - label = "com.branchable.git-annex.assistant" webappscript = unlines [ "#!/bin/sh" , command ++ " webapp" @@ -106,33 +96,20 @@ installOSXAppFile appdir appfile mcontent = do mode <- fileMode <$> getFileStatus src setFileMode dest mode -genOSXAutoStartFile :: String -> String -> String -genOSXAutoStartFile label command = unlines - [ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" - , "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" - , "<plist version=\"1.0\">" - , "<dict>" - , "<key>Label</key>" - , "<string>" ++ label ++ "</string>" - , "<key>ProgramArguments</key>" - , "<array>" - , "<string>" ++ command ++ "</string>" - , "<string>assistant</string>" - , "<string>--autostart</string>" - , "</array>" - , "<key>RunAtLoad</key>" - , "</dict>" - , "</plist>" - ] - -writeDesktop :: FilePath -> IO () +install :: FilePath -> IO () +install = do #ifdef darwin_HOST_OS -writeDesktop = writeOSXDesktop + writeOSXDesktop #else -writeDesktop = writeFDODesktop + writeFDODesktop #endif + unlessM isRoot $ do + programfile <- inDestDir =<< programFile + createDirectoryIfMissing True (parentDir programfile) + writeFile programfile command +main :: IO () main = getArgs >>= go where go [] = error "specify git-annex command" - go (command:_) = writeDesktop command + go (command:_) = install command diff --git a/Command/WebApp.hs b/Command/WebApp.hs index f44053250..7ad6566c9 100644 --- a/Command/WebApp.hs +++ b/Command/WebApp.hs @@ -17,6 +17,7 @@ import Assistant.TransferQueue import Assistant.TransferSlots import Assistant.Threads.WebApp import Assistant.WebApp +import Assistant.Install import Utility.WebApp import Utility.Daemon (checkDaemon, lockPidFile) import Init @@ -39,6 +40,7 @@ seek = [withNothing start] start :: CommandStart start = notBareRepo $ do + liftIO $ ensureInstalled ifM isInitialized ( go , liftIO startNoRepo ) stop where @@ -58,6 +58,6 @@ installManpages copyDest verbosity pkg lbi = installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installDesktopFile copyDest verbosity pkg lbi = - InstallDesktopFile.writeDesktop $ dstBinDir </> "git-annex" + InstallDesktopFile.install $ dstBinDir </> "git-annex" where dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest diff --git a/Utility/OSX.hs b/Utility/OSX.hs new file mode 100644 index 000000000..e5c0b6266 --- /dev/null +++ b/Utility/OSX.hs @@ -0,0 +1,43 @@ +{- OSX stuff + - + - Copyright 2012 Joey Hess <joey@kitenet.net> + - + - Licensed under the GNU GPL version 3 or higher. + -} + +module Utility.OSX where + +import Utility.Path + +import System.FilePath + +autoStartBase :: String -> FilePath +autoStartBase label = "Library" </> "LaunchAgents" </> label ++ ".plist" + +systemAutoStart :: String -> FilePath +systemAutoStart label = "/" </> autoStartBase label + +userAutoStart :: String -> IO FilePath +userAutoStart label = do + home <- myHomeDir + return $ home </> autoStartBase label + +{- Generates an OSX autostart plist file with a given label, command, and + - params to run at boot or login. -} +genOSXAutoStartFile :: String -> String -> [String] -> String +genOSXAutoStartFile label command params = unlines + [ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + , "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" + , "<plist version=\"1.0\">" + , "<dict>" + , "<key>Label</key>" + , "<string>" ++ label ++ "</string>" + , "<key>ProgramArguments</key>" + , "<array>" + , unlines $ map (\v -> "<string>" ++ v ++ "</string>") (command:params) + , "</array>" + , "<key>RunAtLoad</key>" + , "</dict>" + , "</plist>" + ] + diff --git a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp b/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp index dc5c556b4..7955bef15 100755 --- a/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp +++ b/ui-macos/git-annex.app/Contents/MacOS/git-annex-webapp @@ -8,4 +8,12 @@ if [ ! -e "$base/runshell" ]; then echo "** cannot find $base/runshell" >&2 exit 1 fi + +# If this is a standalone app, set a variable that git-annex can use to +# install itself. +if [ -e "$base/bin/git-annex" ]; then + GIT_ANNEX_OSX_WEBAPP_PROGRAM="$base/bin/git-annex" + export OSX_GIT_ANNEX_APP_PROGRAM +fi + "$base/runshell" git-annex webapp "$@" |