X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Main.hs;h=44855689c7c26baefd9f2d55f73bbdc94a6040f6;hb=3c5211253dc61c31196a47486c538b64c32d8c5e;hp=df2cccb5a17ccfd5e37835adb22eeba0c3f709d3;hpb=790089d18791029ad268b3306ca71f8d5ae44ce1;p=Rakka.git diff --git a/Main.hs b/Main.hs index df2cccb..4485568 100644 --- a/Main.hs +++ b/Main.hs @@ -6,7 +6,8 @@ import Network.HTTP.Lucu import Rakka.Environment import Rakka.Resource.Index import Rakka.Resource.Object -import Rakka.Resource.Page +import Rakka.Resource.Render +import Subversion import System.Console.GetOpt import System.Directory import System.Environment @@ -15,6 +16,7 @@ import System.Posix.Files import System.Posix.Types import System.Posix.User + data CmdOpt = OptPortNum PortNumber | OptLSDir FilePath @@ -68,7 +70,8 @@ printUsage = do putStrLn "Usage:" main :: IO () -main = do (opts, nonOpts, errors) <- return . getOpt Permute options =<< getArgs +main = withSubversion $ + do (opts, nonOpts, errors) <- return . getOpt Permute options =<< getArgs when (not $ null errors) $ do mapM_ putStr errors @@ -93,7 +96,7 @@ main = do (opts, nonOpts, errors) <- return . getOpt Permute options =<< getArgs setUserID uid env <- setupEnv lsdir portNum - runHttpd (envLucuConf env) (resTree env) [fallbackPage env] + runHttpd (envLucuConf env) (resTree env) [fallbackRender env] resTree :: Environment -> ResTree