~/.xmonad/Main.hs is now ~/.xmonad/xmonad.hs !

This commit is contained in:
Don Stewart 2007-11-05 03:26:55 +00:00
parent fcea17f920
commit a13c11ff52

17
Main.hs
View File

@ -30,25 +30,24 @@ import System.Posix.Process (executeFile)
main :: IO () main :: IO ()
main = do main = do
handle (hPrint stderr) buildLaunch handle (hPrint stderr) buildLaunch
-- if buildLaunch returns, execute the trusted core xmonad defaultConfig -- if buildLaunch returns, execute the trusted core
xmonad defaultConfig
-- | Build "~/.xmonad/Main.hs" with ghc, then execute it. If there are no -- | Build "~/.xmonad/xmonad.hs" with ghc, then execute it. If there are no
-- errors, this function does not return. An exception is raised in any of -- errors, this function does not return. An exception is raised in any of
-- these cases: -- these cases:
-- * ghc missing -- * ghc missing
-- * ~/.xmonad/Main.hs missing -- * ~/.xmonad/xmonad.hs missing
-- * Main.hs fails to compile -- * xmonad.hs fails to compile
-- ** wrong ghc in path (fails to compile)
-- ** type error, syntax error, ..
-- * Missing xmonad/XMonadContrib modules due to ghc upgrade -- * Missing xmonad/XMonadContrib modules due to ghc upgrade
-- --
buildLaunch :: IO () buildLaunch :: IO ()
buildLaunch = do buildLaunch = do
dir <- fmap (++ "/.xmonad") getHomeDirectory dir <- fmap (++ "/.xmonad") getHomeDirectory
pid <- runProcess "ghc" ["--make", "Main.hs"] (Just dir) pid <- runProcess "ghc" ["--make", "xmonad.hs"] (Just dir)
Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
ExitSuccess <- waitForProcess pid ExitSuccess <- waitForProcess pid
args <- getArgs args <- getArgs
executeFile (dir ++ "/Main") False args Nothing executeFile (dir ++ "/xmonad") False args Nothing
return () return ()