From 3e0ff6db2a22e95373e5513b9bdfbcef538a5b37 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Thu, 19 Nov 2015 12:04:21 +0100 Subject: [PATCH] math: Join lines manually This is an issue with 15-year old versions of bc that don't support BC_LINE_LENGTH. Closes #2548 --- share/functions/math.fish | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/functions/math.fish b/share/functions/math.fish index d80a8c7ff..c190ec631 100644 --- a/share/functions/math.fish +++ b/share/functions/math.fish @@ -7,9 +7,10 @@ function math --description "Perform math calculations in bc" return 0 end - set -lx BC_LINE_LENGTH 0 - set -l out (echo $argv | bc) - test -z "$out"; and return 1 + # Stitch lines together manually + # we can't rely on BC_LINE_LENGTH because some systems don't have a bc version "new" enough + set -l out (echo $argv | bc | string replace -r '\\\\$' '' | string join '') + test -z "$out"; and return 1 echo $out switch $out case 0