diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-20 18:48:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-20 18:48:05 -0400 |
| commit | ee72d4ca76758aa9fcfff0b74d68d6d175d1e715 (patch) | |
| tree | 592644fc31dca64fe676dfa40c7f4336c0eaafd3 | |
| parent | 81c6cea084a67974e7445550da854c69db6c6e6e (diff) | |
Install FDO desktop menu file when webapp is started in standalone mode.
| -rw-r--r-- | Assistant/Install.hs | 3 | ||||
| -rw-r--r-- | Build/DesktopFile.hs | 18 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 4 insertions, 18 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs index b5d3ca98d..56a29c2b3 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -11,6 +11,7 @@ module Assistant.Install where import Assistant.Common import Assistant.Install.AutoStart +import Assistant.Install.Menu import Assistant.Ssh import Locations.UserConfig import Utility.FileMode @@ -49,6 +50,8 @@ ensureInstalled = go =<< standaloneAppBase #ifdef darwin_HOST_OS autostartfile <- userAutoStart osxAutoStartLabel #else + installMenu program + =<< desktopMenuFilePath "git-annex" <$> userConfigDir autostartfile <- autoStartPath "git-annex" <$> userConfigDir #endif installAutoStart program autostartfile diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs index cd7031fe2..abb5788a8 100644 --- a/Build/DesktopFile.hs +++ b/Build/DesktopFile.hs @@ -26,24 +26,6 @@ import System.Posix.Files import System.FilePath import Data.Maybe -{- The command can be either just "git-annex", or the full path to use - - to run it. -} -desktop :: FilePath -> DesktopEntry -desktop command = genDesktopEntry - "Git Annex" - "Track and sync the files in your Git Annex" - False - (command ++ " webapp") - ["Network", "FileTransfer"] - -autostart :: FilePath -> DesktopEntry -autostart command = genDesktopEntry - "Git Annex Assistant" - "Autostart" - False - (command ++ " assistant --autostart") - [] - systemwideInstall :: IO Bool systemwideInstall = isroot <||> destdirset where diff --git a/debian/changelog b/debian/changelog index 8b9cccd15..2d8785f25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (4.20130418) UNRELEASED; urgency=low * assistant: Work around misfeature in git 1.8.2 that makes `git commit --alow-empty -m ""` run an editor. + * Install FDO desktop menu file when webapp is started in standalone mode. -- Joey Hess <joeyh@debian.org> Thu, 18 Apr 2013 16:22:48 -0400 |