From 68b3beefd87468204a8d8252d3487fae95b43f80 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 9 Jul 2013 20:50:41 -0400
Subject: linux standalone auto-install icons

---
 Build/DesktopFile.hs | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'Build')

diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs
index f3293d128..9f4ba5992 100644
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -28,7 +28,6 @@ import System.Posix.Files
 #endif
 import System.FilePath
 import Data.Maybe
-import System.IO
 
 systemwideInstall :: IO Bool
 #ifndef mingw32_HOST_OS 
@@ -52,25 +51,14 @@ writeFDODesktop command = do
 	systemwide <- systemwideInstall
 
 	datadir <- if systemwide then return systemDataDir else userDataDir
-	installMenu command
-		=<< inDestDir (desktopMenuFilePath "git-annex" datadir)
-
-	installIcon "doc/logo.svg"
-		=<< inDestDir (iconFilePath "git-annex.svg" "scalable" datadir)
-	installIcon "doc/favicon.png"
-		=<< inDestDir (iconFilePath "git-annex.png" "16x16" datadir)
+	menufile <- inDestDir (desktopMenuFilePath "git-annex" datadir)
+	icondir <- inDestDir (iconDir datadir)
+	installMenu command menufile "doc" icondir
 
 	configdir <- if systemwide then return systemConfigDir else userConfigDir
 	installAutoStart command 
 		=<< inDestDir (autoStartPath "git-annex" configdir)
 
-installIcon :: FilePath -> FilePath -> IO ()
-installIcon src dest = do
-	createDirectoryIfMissing True (parentDir dest)
-	withBinaryFile src ReadMode $ \hin ->
-		withBinaryFile dest WriteMode $ \hout ->
-			hGetContents hin >>= hPutStr hout
-
 writeOSXDesktop :: FilePath -> IO ()
 writeOSXDesktop command = do
 	installAutoStart command =<< inDestDir =<< ifM systemwideInstall
-- 
cgit v1.2.3