From 09430f09da5ea22a00ec682293568b1f8d3e30ec Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 28 Sep 2015 10:06:36 -1000
Subject: [PATCH] web: fix --file-url option (#285)

Finish the rename begun by 3fb5e25.
---
 hledger-web/Hledger/Web/Main.hs       | 4 ++--
 hledger-web/Hledger/Web/WebOptions.hs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs
index 6377690d8..f7a49e7d3 100644
--- a/hledger-web/Hledger/Web/Main.hs
+++ b/hledger-web/Hledger/Web/Main.hs
@@ -69,13 +69,13 @@ web opts j = do
   let j' = filterJournalTransactions (queryFromOpts d $ reportopts_ $ cliopts_ opts) j
       p = port_ opts
       u = base_url_ opts
-      staticRoot' = pack <$> static_root_ opts
+      staticRoot = pack <$> file_url_ opts
   _ <- printf "Starting web app on port %d with base url %s\n" p u
   app <- makeApplication opts j' AppConfig{appEnv = Development
                                           ,appPort = p
                                           ,appRoot = pack u
                                           ,appHost = fromString "*4"
-                                          ,appExtra = Extra "" Nothing staticRoot'
+                                          ,appExtra = Extra "" Nothing staticRoot
                                           }
   if server_ opts
    then do
diff --git a/hledger-web/Hledger/Web/WebOptions.hs b/hledger-web/Hledger/Web/WebOptions.hs
index efd2c2c08..155c92587 100644
--- a/hledger-web/Hledger/Web/WebOptions.hs
+++ b/hledger-web/Hledger/Web/WebOptions.hs
@@ -50,9 +50,9 @@ webmode =  (mode "hledger-web" [("command","web")]
 -- hledger-web options, used in hledger-web and above
 data WebOpts = WebOpts {
      server_   :: Bool
-    ,base_url_ :: String
     ,port_     :: Int
-    ,static_root_ :: Maybe String
+    ,base_url_ :: String
+    ,file_url_ :: Maybe String
     ,cliopts_  :: CliOpts
  } deriving (Show)
 
@@ -74,7 +74,7 @@ rawOptsToWebOpts rawopts = checkWebOpts <$> do
               port_ = p
              ,server_ = boolopt "server" rawopts
              ,base_url_ = maybe (defbaseurl p) stripTrailingSlash $ maybestringopt "base-url" rawopts
-             ,static_root_ = stripTrailingSlash <$> maybestringopt "static-root" rawopts
+             ,file_url_ = stripTrailingSlash <$> maybestringopt "file-url" rawopts
              ,cliopts_   = cliopts
              }
   where