From b58a3508034e3cae2c97a8c3142ea8e83deb9cda Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 3 Dec 2019 08:35:38 -0800
Subject: [PATCH] install: update hledger-install for 1.16.1, disable addons
 for now

---
 hledger-install/hledger-install.sh | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/hledger-install/hledger-install.sh b/hledger-install/hledger-install.sh
index 274a7044e..7d1d9cc56 100755
--- a/hledger-install/hledger-install.sh
+++ b/hledger-install/hledger-install.sh
@@ -50,13 +50,13 @@ HERE
 HLEDGER_INSTALL_TOOL=hledger-install.sh
 
 # this script's version
-HLEDGER_INSTALL_VERSION=20191018
+HLEDGER_INSTALL_VERSION=20191203
 
 # stackage snapshot to use when installing with stack.
 # You can try specifying a different stackage version here, or 
 # commenting out this line to use your current global resolver,
 # to avoid unnecessary building.
-RESOLVER="--resolver=lts-14.4"
+RESOLVER="--resolver=lts-14.16"
 
 # things to be installed
 
@@ -72,10 +72,10 @@ hledger-interest \
 "
 
 # latest hledger package versions; update often:
-HLEDGER_LIB_VERSION=1.15.2
-HLEDGER_VERSION=1.15.2
-HLEDGER_UI_VERSION=1.15
-HLEDGER_WEB_VERSION=1.15
+HLEDGER_LIB_VERSION=1.16.1
+HLEDGER_VERSION=1.16.1
+HLEDGER_UI_VERSION=1.16.1
+HLEDGER_WEB_VERSION=1.16.1
 
 HLEDGER_IADD_VERSION=1.3.9
 HLEDGER_INTEREST_VERSION=1.5.3
@@ -1023,19 +1023,19 @@ if [[ $(cmpver "$(cmd_version hledger-web 2>/dev/null)" $HLEDGER_WEB_VERSION) =
   echo
 fi
 
-# Third-party addons. We sometimes build these with an older version
-# of hledger[-lib], if their bounds have not been updated yet.
-if [[ $(cmpver "$(cmd_version hledger-iadd 2>/dev/null)" $HLEDGER_IADD_VERSION) = 2 ]]; then
-  echo Installing hledger-iadd
-  try_install hledger-iadd-$HLEDGER_IADD_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
-  echo
-fi
+# # Third-party addons. We sometimes build these with an older version
+# # of hledger[-lib], if their bounds have not been updated yet.
+# if [[ $(cmpver "$(cmd_version hledger-iadd 2>/dev/null)" $HLEDGER_IADD_VERSION) = 2 ]]; then
+#   echo Installing hledger-iadd
+#   try_install hledger-iadd-$HLEDGER_IADD_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
+#   echo
+# fi
 
-if [[ $(cmpver "$(cmd_version hledger-interest 2>/dev/null)" $HLEDGER_INTEREST_VERSION) = 2 ]]; then
-  echo Installing hledger-interest
-  try_install hledger-interest-$HLEDGER_INTEREST_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
-  echo
-fi
+# if [[ $(cmpver "$(cmd_version hledger-interest 2>/dev/null)" $HLEDGER_INTEREST_VERSION) = 2 ]]; then
+#   echo Installing hledger-interest
+#   try_install hledger-interest-$HLEDGER_INTEREST_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
+#   echo
+# fi
 
 # show new installation status
 echo