OSX: Stop installing non-self-contained webapp into Desktop directory.
This was a stopgap, and we have the self-contained webapp now.
This commit is contained in:
parent
e1d0c7813b
commit
1f1d75bc13
2 changed files with 1 additions and 26 deletions
|
@ -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
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -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 <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400
|
||||
|
||||
|
|
Loading…
Reference in a new issue