From 23fe661d37ceb6c7bf754e9dc8fd5dda89793b63 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 1 Aug 2012 23:31:53 -0400
Subject: [PATCH] install autostart file too

---
 Build/InstallDesktopFile.hs | 29 +++++++++++++++++++++--------
 Setup.hs                    |  2 +-
 Utility/FreeDesktop.hs      | 29 +++++++++++++++++++----------
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/Build/InstallDesktopFile.hs b/Build/InstallDesktopFile.hs
index b4a56a2cbd..a08743f3da 100644
--- a/Build/InstallDesktopFile.hs
+++ b/Build/InstallDesktopFile.hs
@@ -1,4 +1,5 @@
-{- Generating and installing a desktop menu entry file.
+{- Generating and installing a desktop menu entry file
+ - and a desktop autostart file.
  -
  - Copyright 2012 Joey Hess <joey@kitenet.net>
  -
@@ -24,16 +25,28 @@ desktop command = genDesktopEntry
 	(command ++ " webapp")
 	["Network", "FileTransfer"]
 
-writeDesktop :: DesktopEntry -> IO ()
-writeDesktop d = do
+autostart :: FilePath -> DesktopEntry
+autostart command = genDesktopEntry
+	"Git Annex Assistant"
+	"Autostart"
+	False
+	(command ++ " assistant --autostart")
+	[]
+
+writeDesktop :: String -> IO ()
+writeDesktop command = do
 	destdir <- catchDefaultIO (getEnv "DESTDIR") ""
 	uid <- fromIntegral <$> getRealUserID
-	dest <- if uid /= 0
-		then userDesktopMenuFilePath "git-annex"
-		else return $ systemDesktopMenuFilePath "git-annex"
-	writeDesktopMenuFile d dest
+
+	datadir <- if uid /= 0 then userDataDir else return systemDataDir
+	writeDesktopMenuFile (desktop command) $
+		desktopMenuFilePath "git-annex" datadir
+
+	configdir <- if uid /= 0 then userConfigDir else return systemConfigDir
+	writeDesktopMenuFile (autostart command) $
+		autoStartPath "git-annex" configdir
 
 main = getArgs >>= go
 	where
 		go [] = error "specify git-annex command"
-		go (command:_) = writeDesktop $ desktop command
+		go (command:_) = writeDesktop command
diff --git a/Setup.hs b/Setup.hs
index 4451e86455..06390975bb 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -52,6 +52,6 @@ installManpages copyDest verbosity pkg lbi =
 
 installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
 installDesktopFile copyDest verbosity pkg lbi =
-	InstallDesktopFile.writeDesktop $ InstallDesktopFile.desktop $ dstBinDir </> "git-annex"
+	InstallDesktopFile.writeDesktop $ dstBinDir </> "git-annex"
 	where
 		dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest
diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs
index 5e38d382d5..5bab4950ab 100644
--- a/Utility/FreeDesktop.hs
+++ b/Utility/FreeDesktop.hs
@@ -14,8 +14,12 @@ module Utility.FreeDesktop (
 	genDesktopEntry,
 	buildDesktopMenuFile,
 	writeDesktopMenuFile,
-	userDesktopMenuFilePath,
-	systemDesktopMenuFilePath		
+	desktopMenuFilePath,
+	autoStartPath,
+	systemDataDir,
+	systemConfigDir,
+	userDataDir,
+	userConfigDir	
 ) where
 
 import Utility.Exception
@@ -70,18 +74,23 @@ writeDesktopMenuFile d file = do
 	createDirectoryIfMissing True (parentDir file)
 	writeFile file $ buildDesktopMenuFile d
 
-userDesktopMenuFilePath :: String -> IO FilePath
-userDesktopMenuFilePath basename = do
-	datadir <- userDataDir
-	return $ datadir </> "applications" </> desktopfile basename
+desktopMenuFilePath :: String -> FilePath -> FilePath
+desktopMenuFilePath basename datadir = 
+	datadir </> "applications" </> desktopfile basename
 
-systemDesktopMenuFilePath :: String -> FilePath
-systemDesktopMenuFilePath basename =
-	"/usr/share/applications" </> desktopfile basename
+autoStartPath :: String -> FilePath -> FilePath
+autoStartPath basename configdir =
+	configdir </> "autostart" </> desktopfile basename
 
 desktopfile :: FilePath -> FilePath
 desktopfile f = f ++ ".desktop"
 
+systemDataDir :: FilePath
+systemDataDir = "/usr/share"
+
+systemConfigDir :: FilePath
+systemConfigDir = "/etc/xdg"
+
 userDataDir :: IO FilePath
 userDataDir = do
 	dir <- xdgEnv "DATA_HOME" =<< myHomeDir
@@ -89,7 +98,7 @@ userDataDir = do
 
 userConfigDir :: IO FilePath
 userConfigDir = do
-	dir <- xdgEnv "DATA_HOME" =<< myHomeDir
+	dir <- xdgEnv "CONFIG_HOME" =<< myHomeDir
 	return $ dir </> ".config"
 
 xdgEnv :: String -> String -> IO String