From 05bc3fa99fe475b98e5f1de55e8065c33d8390c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 Oct 2012 15:33:02 -0400 Subject: OSX: Stop installing non-self-contained webapp into Desktop directory. This was a stopgap, and we have the self-contained webapp now. --- Build/InstallDesktopFile.hs | 26 -------------------------- debian/changelog | 1 + 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/Build/InstallDesktopFile.hs b/Build/InstallDesktopFile.hs index 1bcba70fd..121205687 100644 --- a/Build/InstallDesktopFile.hs +++ b/Build/InstallDesktopFile.hs @@ -74,32 +74,6 @@ writeOSXDesktop command = do , userAutoStart osxAutoStartLabel ) - {- 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 - webappscript = unlines - [ "#!/bin/sh" - , command ++ " webapp" - ] - -installOSXAppFile :: FilePath -> FilePath -> Maybe String -> IO () -installOSXAppFile appdir appfile mcontent = do - let src = "standalone" "osx" appdir appfile - home <- myHomeDir - dest <- ifM systemwideInstall - ( return $ "/Applications" appdir appfile - , return $ home "Desktop" appdir appfile - ) - createDirectoryIfMissing True (parentDir dest) - case mcontent of - Just content -> writeFile dest content - Nothing -> copyFile src dest - mode <- fileMode <$> getFileStatus src - setFileMode dest mode - install :: FilePath -> IO () install command = do #ifdef darwin_HOST_OS diff --git a/debian/changelog b/debian/changelog index 8ec4d10fd..fb23ad7d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ git-annex (3.20121018) UNRELEASED; urgency=low exception-safe versions of SampleVar and QSemN. Thanks, Ben Gamari for an excellent patch set. * file:/// URLs can now be used with the web special remote. + * OSX: Stop installing non-self-contained webapp into Desktop directory. -- Joey Hess Wed, 17 Oct 2012 14:24:10 -0400 -- cgit v1.2.3