;bin: fix build errors in all scripts
This commit is contained in:
parent
92f022dee4
commit
1fefbe9159
@ -10,7 +10,7 @@
|
|||||||
-}
|
-}
|
||||||
import Data.Text.Lazy.IO as TL
|
import Data.Text.Lazy.IO as TL
|
||||||
import System.Environment (getArgs)
|
import System.Environment (getArgs)
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
cmdmode = hledgerCommandMode
|
cmdmode = hledgerCommandMode
|
||||||
@ -34,13 +34,13 @@ main = do
|
|||||||
args <- getArgs
|
args <- getArgs
|
||||||
let report1args = takeWhile (/= "--") args
|
let report1args = takeWhile (/= "--") args
|
||||||
let report2args = drop 1 $ dropWhile (/= "--") args
|
let report2args = drop 1 $ dropWhile (/= "--") args
|
||||||
(_,_,report1) <- mbReport report1args
|
(opts,_,_,report1) <- mbReport report1args
|
||||||
(ropts2,j,report2) <- mbReport report2args
|
(_,ropts2,j,report2) <- mbReport report2args
|
||||||
let pastAsBudget = combineBudgetAndActual ropts2 j report1{prDates=prDates report2} report2
|
let pastAsBudget = combineBudgetAndActual ropts2 j report1{prDates=prDates report2} report2
|
||||||
TL.putStrLn $ budgetReportAsText ropts2 pastAsBudget
|
writeOutputLazyText opts $ budgetReportAsText ropts2 pastAsBudget
|
||||||
where
|
where
|
||||||
mbReport args = do
|
mbReport args = do
|
||||||
opts@CliOpts{reportspec_=rspec} <- getHledgerCliOpts' cmdmode args
|
opts@CliOpts{reportspec_=rspec} <- getHledgerCliOpts' cmdmode args
|
||||||
d <- getCurrentDay
|
d <- getCurrentDay
|
||||||
(report,j) <- withJournalDo opts $ \j -> return (multiBalanceReport rspec j, j)
|
(report,j) <- withJournalDo opts $ \j -> return (multiBalanceReport rspec j, j)
|
||||||
return (_rsReportOpts rspec,j,report)
|
return (opts, _rsReportOpts rspec,j,report)
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import qualified Data.Text as T
|
|||||||
import Safe
|
import Safe
|
||||||
import System.Exit
|
import System.Exit
|
||||||
import Hledger
|
import Hledger
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
cmdmode :: Mode RawOpts
|
cmdmode :: Mode RawOpts
|
||||||
|
|||||||
@ -17,7 +17,7 @@ $ hledger check-tagfiles # compiles every time (?)
|
|||||||
|
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
import System.Directory
|
import System.Directory
|
||||||
import System.Exit
|
import System.Exit
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@ $ hledger check-tagfiles # compiles if there's no compiled version
|
|||||||
|
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
import System.Directory
|
import System.Directory
|
||||||
import System.Exit
|
import System.Exit
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
{-# OPTIONS_GHC -Wno-missing-signatures #-}
|
{-# OPTIONS_GHC -Wno-missing-signatures #-}
|
||||||
|
|
||||||
import System.Environment (getArgs)
|
import System.Environment (getArgs)
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import Data.Map.Merge.Strict
|
import Data.Map.Merge.Strict
|
||||||
import qualified Data.Text.Lazy.IO as TL
|
import qualified Data.Text.Lazy.IO as TL
|
||||||
|
|||||||
@ -40,7 +40,7 @@ import Text.Printf
|
|||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import qualified Data.Text.IO as T
|
import qualified Data.Text.IO as T
|
||||||
|
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
cmdmode = hledgerCommandMode
|
cmdmode = hledgerCommandMode
|
||||||
@ -156,7 +156,7 @@ main = do
|
|||||||
force = boolopt "force" rawopts
|
force = boolopt "force" rawopts
|
||||||
|
|
||||||
-- parse the AMT arg as a cost-less Amount (any provided cost is ignored)
|
-- parse the AMT arg as a cost-less Amount (any provided cost is ignored)
|
||||||
eamt = styleAmount (journalCommodityStyles j) . amountStripCost <$> parseamount amtarg
|
eamt = styleAmounts (journalCommodityStyles j) . amountStripCost <$> parseamount amtarg
|
||||||
amt = case eamt of
|
amt = case eamt of
|
||||||
Left err ->
|
Left err ->
|
||||||
error' $ "could not parse " ++ show amtarg ++ " as a hledger amount\n" ++ customErrorBundlePretty err ++ "\n" ++shortusage
|
error' $ "could not parse " ++ show amtarg ++ " as a hledger amount\n" ++ customErrorBundlePretty err ++ "\n" ++shortusage
|
||||||
|
|||||||
@ -20,7 +20,7 @@ $ hledger print-location -f examples/sample.journal desc:eat
|
|||||||
|
|
||||||
import Data.String.QQ (s)
|
import Data.String.QQ (s)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
cmdmode = hledgerCommandMode
|
cmdmode = hledgerCommandMode
|
||||||
|
|||||||
@ -24,7 +24,7 @@ import qualified Data.Text as T
|
|||||||
import Data.Time.Calendar
|
import Data.Time.Calendar
|
||||||
import Safe
|
import Safe
|
||||||
-- import Hledger
|
-- import Hledger
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
cmdmode = hledgerCommandMode
|
cmdmode = hledgerCommandMode
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
import Data.String.QQ (s)
|
import Data.String.QQ (s)
|
||||||
import qualified Data.Text.IO as T
|
import qualified Data.Text.IO as T
|
||||||
import Hledger
|
import Hledger
|
||||||
import Hledger.Cli
|
import Hledger.Cli.Script
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
cmdmode = hledgerCommandMode
|
cmdmode = hledgerCommandMode
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user