From 4747e2eacfadfc1f228acdfc6a0d6e48bc6bceaa Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sat, 15 Aug 2020 09:51:59 -0700
Subject: [PATCH] ;bin: consistent use of stack script, package updates

---
 bin/hledger-balance-as-budget.hs |  5 ++---
 bin/hledger-check-tag-files.hs   | 10 ++++++----
 bin/hledger-check.hs             | 22 +++++++++++-----------
 bin/hledger-combine-balances.hs  |  4 ++--
 bin/hledger-smooth.hs            |  2 +-
 bin/hledger-swap-dates.hs        |  2 +-
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/bin/hledger-balance-as-budget.hs b/bin/hledger-balance-as-budget.hs
index bfb45fbef..3a22e9812 100755
--- a/bin/hledger-balance-as-budget.hs
+++ b/bin/hledger-balance-as-budget.hs
@@ -1,10 +1,9 @@
 #!/usr/bin/env stack
-{- stack runghc --verbosity info
-   --package hledger-lib
+{- stack script --compile --resolver lts-16.3
    --package hledger
 -}
 
-{-# OPTIONS_GHC -Wno-missing-signatures -Wno-name-shadowing #-}
+-- {-# OPTIONS_GHC -Wno-missing-signatures -Wno-name-shadowing #-}
 
 {-| Construct two balance reports for two different time periods and use one of the as "budget" for
     the other, thus comparing them
diff --git a/bin/hledger-check-tag-files.hs b/bin/hledger-check-tag-files.hs
index 174d3cff5..f1b6a3af8 100755
--- a/bin/hledger-check-tag-files.hs
+++ b/bin/hledger-check-tag-files.hs
@@ -1,9 +1,11 @@
 #!/usr/bin/env stack
--- stack script --compile --resolver nightly-2020-03-26 --package hledger-lib --package hledger --package directory --package text
--- Add this to see more progress: --verbosity info
--- Change --resolver to an already-installed one if you like
+{- stack script --compile --resolver lts-16.3
+   --package hledger
+   --package directory
+   --package text
+-}
 {-
-hledger-check-tag-files script (stack version)
+hledger-check-tag-files stack script.
 Read the default journal and give an error if any tag values
 containing '/' do not exist as file paths.
 Usage:
diff --git a/bin/hledger-check.hs b/bin/hledger-check.hs
index a378aeaa7..33fa213c8 100755
--- a/bin/hledger-check.hs
+++ b/bin/hledger-check.hs
@@ -1,16 +1,16 @@
 #!/usr/bin/env stack
-{- stack script --compile --resolver=lts-16.2
-  --package base-compat
-  --package filepath
-  --package hledger-lib
-  --package optparse-applicative
-  --package megaparsec
-  --package text
-  --package time
-  --package transformers
--} -- Change --resolver above to one you already have installed, if you like
-{-
+{- stack script --compile --resolver=lts-16.3
+   --package base-compat
+   --package filepath
+   --package hledger-lib
+   --package optparse-applicative
+   --package megaparsec
+   --package text
+   --package time
+   --package transformers
+-}
 
+{-
 ```
 Usage: hledger-check [-f|--file FILE] [--alias OLD=NEW] [--ignore-assertions]
                      [-b|--begin DATE] [-e|--end DATE] [-C|--cleared]
diff --git a/bin/hledger-combine-balances.hs b/bin/hledger-combine-balances.hs
index be65e9b5f..499ae3767 100755
--- a/bin/hledger-combine-balances.hs
+++ b/bin/hledger-combine-balances.hs
@@ -1,7 +1,7 @@
 #!/usr/bin/env stack
-{- stack runghc --verbosity info
-   --package hledger-lib
+{- stack script --compile --resolver lts-16.3
    --package hledger
+   --package containers
 -}
 
 {-# OPTIONS_GHC -Wno-missing-signatures -Wno-name-shadowing #-}
diff --git a/bin/hledger-smooth.hs b/bin/hledger-smooth.hs
index d81554b70..748d7a8d3 100755
--- a/bin/hledger-smooth.hs
+++ b/bin/hledger-smooth.hs
@@ -1,5 +1,5 @@
 #!/usr/bin/env stack
-{- stack runghc --verbosity info
+{- stack script --compile --resolver lts-16.3
    --package hledger
    --package safe
    --package string-qq
diff --git a/bin/hledger-swap-dates.hs b/bin/hledger-swap-dates.hs
index bb53ea499..f574bbde2 100755
--- a/bin/hledger-swap-dates.hs
+++ b/bin/hledger-swap-dates.hs
@@ -1,5 +1,5 @@
 #!/usr/bin/env stack
-{- stack runghc --verbosity info
+{- stack script --compile --resolver lts-16.3
    --package hledger-lib
    --package hledger
    --package string-qq