slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

;pkg:hledger-install: try third party packages again without bounds

Browse Source 
This makes hledger-iadd and hledger-interest more likely to install
successfully, even if their bounds have not yet been updated for a new
hledger release.
This commit is contained in:
Simon Michael 2024-12-12 17:22:01 -10:00
parent 57bc54b2a4
commit c9128c6b97
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hledger-install/hledger-install.sh
View File

@ -856,7 +856,7 @@ cmd_location() {
# Get the given command's version, ie the first number in the first line of its --version output, # Get the given command's version, ie the first number in the first line of its --version output,
# or empty string if there's a problem. # or empty string if there's a problem.
cmd_version() { cmd_version() {
(command "$1" --version 2>/dev/null | head -n1 | grep -E '[0-9]' | $SED -e 's/[^0-9]*([0-9][0-9.]*).*/\1/') || "" (command "$1" --version 2>/dev/null | head -n1 | grep -E '[0-9]' | $SED -e 's/[^0-9]*([0-9][0-9.]*).*/\1/') || echo ""
} }
# Check whether the given command exists with given version # Check whether the given command exists with given version
@ -898,11 +898,24 @@ quietly_run() {
try_install() { try_install() {
cd # ensure we install at user level, not in some project's stack/cabal setup cd # ensure we install at user level, not in some project's stack/cabal setup
if has_cmd stack ; then if has_cmd stack ; then
try_info stack install --install-ghc --resolver $STACKAGE_SNAPSHOT "$@" --verbosity="$STACK_VERBOSITY" || echo "Failed to install $@" try_info stack install --install-ghc --resolver $STACKAGE_SNAPSHOT "$@" --verbosity="$STACK_VERBOSITY" || (echo "Failed to install $@"; false)
elif has_cmd cabal ; then elif has_cmd cabal ; then
try_info cabal install "$@" --verbose="$CABAL_VERBOSITY" || echo "Failed to install $@" try_info cabal install "$@" --verbose="$CABAL_VERBOSITY" || (echo "Failed to install $@"; false)
else else
echo "Failed to install $@" echo "Failed to install $@"; false
fi
}
# Like the above but try harder, ignoring dependency bounds. Could potentially try to install something very old.
try_install_ignore_bounds() {
cd # ensure we install at user level, not in some project's stack/cabal setup
echo "Trying without dependency bounds"
if has_cmd stack ; then
try_info stack install --allow-newer --install-ghc --resolver $STACKAGE_SNAPSHOT "$@" --verbosity="$STACK_VERBOSITY" || (echo "Failed to install $@"; false)
elif has_cmd cabal ; then
try_info cabal install --allow-newer "$@" --verbose="$CABAL_VERBOSITY" || (echo "Failed to install $@"; false)
else
echo "Failed to install $@"; false
fi fi
} }
@ -913,7 +926,7 @@ try_install_py() {
if has_cmd pip ; then if has_cmd pip ; then
try_info pip install --disable-pip-version-check -U "$@" $PIP_VERBOSITY try_info pip install --disable-pip-version-check -U "$@" $PIP_VERBOSITY
else else
echo "Failed to install $@" echo "Failed to install $@"; false
fi fi
} }
@ -1076,12 +1089,13 @@ else
fi fi
# Third-party addons. # Third-party addons.
# We might have to build these with an older version of hledger, # These often won't build with new hledger right away just because of tight bounds,
# if they have not been updated yet. # so we'll also try building without bounds. Perhaps a little risky.
if [[ $(cmpver "$(cmd_version hledger-iadd 2>/dev/null)" $HLEDGER_IADD_VERSION) = 2 ]]; then if [[ $(cmpver "$(cmd_version hledger-iadd 2>/dev/null)" $HLEDGER_IADD_VERSION) = 2 ]]; then
echo Installing hledger-iadd echo Installing hledger-iadd
try_install hledger-iadd-$HLEDGER_IADD_VERSION hledger-lib-$HLEDGER_LIB_VERSION $STACK_EXTRA_DEPS try_install hledger-iadd-$HLEDGER_IADD_VERSION hledger-lib-$HLEDGER_LIB_VERSION $STACK_EXTRA_DEPS \
|| try_install_ignore_bounds hledger-iadd-$HLEDGER_IADD_VERSION hledger-lib-$HLEDGER_LIB_VERSION $STACK_EXTRA_DEPS
echo echo
else else
echo hledger-iadd is up to date echo hledger-iadd is up to date
@ -1089,7 +1103,8 @@ fi
if [[ $(cmpver "$(cmd_version hledger-interest 2>/dev/null)" $HLEDGER_INTEREST_VERSION) = 2 ]]; then if [[ $(cmpver "$(cmd_version hledger-interest 2>/dev/null)" $HLEDGER_INTEREST_VERSION) = 2 ]]; then
echo Installing hledger-interest echo Installing hledger-interest
try_install hledger-interest-$HLEDGER_INTEREST_VERSION hledger-lib-$HLEDGER_LIB_VERSION $STACK_EXTRA_DEPS try_install hledger-interest-$HLEDGER_INTEREST_VERSION hledger-lib-$HLEDGER_LIB_VERSION $STACK_EXTRA_DEPS \
|| try_install_ignore_bounds hledger-interest-$HLEDGER_INTEREST_VERSION hledger-lib-$HLEDGER_LIB_VERSION $STACK_EXTRA_DEPS
echo echo
else else
echo hledger-interest is up to date echo hledger-interest is up to date