From e1d784cd5f63becd20ae4b70f547ddae0d4fc93c Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 14 May 2018 09:34:56 -0700 Subject: [PATCH] install: there's only a dynamic stack binary on linux now, use that (fix #770) [ci skip] --- hledger-install/hledger-install.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hledger-install/hledger-install.sh b/hledger-install/hledger-install.sh index 7a307043b..23560b0cc 100755 --- a/hledger-install/hledger-install.sh +++ b/hledger-install/hledger-install.sh @@ -213,7 +213,7 @@ do_ubuntu_install() { elif is_64_bit ; then install_dependencies print_bindist_notice - install_64bit_static_binary + install_64bit_linux_binary else install_dependencies print_bindist_notice @@ -239,7 +239,7 @@ do_debian_install() { elif is_64_bit ; then install_dependencies print_bindist_notice - install_64bit_static_binary + install_64bit_linux_binary else install_dependencies print_bindist_notice @@ -259,7 +259,7 @@ do_fedora_install() { if is_64_bit ; then install_dependencies "$1" print_bindist_notice - install_64bit_static_binary + install_64bit_linux_binary else install_dependencies "$1" print_bindist_notice @@ -279,7 +279,7 @@ do_centos_install() { if is_64_bit ; then install_dependencies print_bindist_notice - install_64bit_static_binary + install_64bit_linux_binary else install_dependencies case "$1" in @@ -332,7 +332,7 @@ do_alpine_install() { } install_dependencies if is_64_bit ; then - install_64bit_static_binary + install_64bit_linux_binary else die "Sorry, there is currently no 32-bit Alpine Linux binary available." fi @@ -348,7 +348,7 @@ do_sloppy_install() { if is_arm ; then install_arm_binary elif is_64_bit ; then - install_64bit_static_binary + install_64bit_linux_binary else install_32bit_standard_binary fi @@ -558,6 +558,10 @@ install_32bit_standard_binary() { install_from_bindist "linux-i386" } +install_64bit_linux_binary() { + install_from_bindist "linux-x86_64" +} + install_64bit_static_binary() { install_from_bindist "linux-x86_64-static" }