From b27a8a1ee415fba947dfa7a7b8d5b476b58fa274 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 24 Jan 2023 11:41:53 -1000 Subject: [PATCH] imp: install: cleanups --- hledger-install/hledger-install.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hledger-install/hledger-install.sh b/hledger-install/hledger-install.sh index 7073aa5b2..b6da158fc 100755 --- a/hledger-install/hledger-install.sh +++ b/hledger-install/hledger-install.sh @@ -3,7 +3,10 @@ # and some other POSIX tools. # This is based on get-stack.sh which is copyright (c) 2015-2017, Stack contributors. -#set -e # causes trouble, https://github.com/simonmichael/hledger/issues/714 +# This was disabled as a workaround for https://github.com/simonmichael/hledger/issues/714 +# It has been left off so that one uninstallable tool doesn't block the others. +# (XXX though, try_install is supposed to continue on failure) +#set -e set -o pipefail # this script's name (can't use $0 when it's piped into bash) @@ -88,8 +91,11 @@ HLEDGER_STOCKQUOTES_VERSION=0.1.2.1 STACK_MIN_VERSION=2.5.1 -# start of (most of) get-stack.sh, https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh +############################################################################## +# Below is (most of) FP Complete's/Stack team's get-stack.sh, from +# https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh . # CHANGED marks a few of our customisations, but not all. +############################################################################## HOME_LOCAL_BIN="$HOME/.local/bin" USR_LOCAL_BIN="/usr/local/bin"