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

fix: Run shellcheck on hledger-bar

Browse Source 
I [encountered][1] an unexpected error when testing hledger-bar for
proposed inclusion in Homebrew's default installation of hledger:

    /opt/homebrew/Cellar/hledger/1.32.2_1/bin/hledger-bar: line 81:
    conditional binary operator expected

I'm doubt that this is fixed by running shellcheck, but checking
a script against shellcheck is usually one of the first things I check
before debugging shell!

This patch is ~generated by shellcheck with

    shellcheck --shell=bash --enable=all --format=diff bin/hledger-bar | \
    git apply

plus some extra, manual additions in the form of a shellcheck directive
to accept something that's a little abnormal for shellcheck but fine
here. The `set -o inherit_exit` was also recommended by shellcheck.

[1]: https://github.com/Homebrew/homebrew-core/actions/runs/7606843601/job/20713321881?pr=160590
This commit is contained in:
Colin Dean 2024-01-22 00:55:32 -05:00 committed by Simon Michael
parent bd8bd393f2
commit 4faa381ccd
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/hledger-bar
View File

@ -78,7 +78,7 @@ poschar="+"
# https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit and 24-bit colors. # https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit and 24-bit colors.
# Disable if stdout is not a terminal or NO_COLOR is defined. # Disable if stdout is not a terminal or NO_COLOR is defined.
if [[ ! -t 1 || $NO_COLOR ]]; then if [[ ! -t 1 || -n ${NO_COLOR} ]]; then
red='' red=''
green='' green=''
nocol='' nocol=''
@ -93,7 +93,7 @@ unquote() { s="${1%\"}"; echo "${s#\"}"; }
# process command line # process command line
shownum=0 shownum=0
verbose=0 verbose=0
scale=$defscale scale=${defscale}
if [[ $# -eq 0 || $1 == --help || $1 == -h ]]; then usage; exit; fi if [[ $# -eq 0 || $1 == --help || $1 == -h ]]; then usage; exit; fi
if [[ $1 == -v ]]; then shownum=1; shift; elif [[ $1 == -vv ]]; then shownum=1; verbose=1; shift; fi if [[ $1 == -v ]]; then shownum=1; shift; elif [[ $1 == -vv ]]; then shownum=1; verbose=1; shift; fi
if [[ $1 =~ ^[0-9]+$ ]]; then scale=$1; shift; fi if [[ $1 =~ ^[0-9]+$ ]]; then scale=$1; shift; fi
@ -107,7 +107,7 @@ cmd="hledger balance -Ocsv --transpose -N -0 --layout=bare -M $*"
printcmd() { printcmd() {
echo "From command (might need added quotes):" # don't know how to print all the slashes echo "From command (might need added quotes):" # don't know how to print all the slashes
echo "$cmd" echo "${cmd}"
} }
printamterr() { printamterr() {
@ -120,17 +120,18 @@ EOS
} }
# main # main
# shellcheck disable=SC2312
$cmd | while IFS=, read -r period amount; do ${cmd} | while IFS=, read -r period amount; do
if [[ ! $amount =~ [0-9] ]]; then continue; fi # ignore lines where amount has no digits if [[ ! ${amount} =~ [0-9] ]]; then continue; fi # ignore lines where amount has no digits
if [[ $amount =~ , ]]; then printamterr "$amount"; exit 1; fi # check there is a single amount column if [[ ${amount} =~ , ]]; then printamterr "${amount}"; exit 1; fi # check there is a single amount column
int=$(printf '%.f' "$(unquote "$amount")") set -o inherit_exit
if [[ $shownum -gt 0 ]]; then num=$(printf "%10d " "$int"); else num=""; fi int=$(printf '%.f' "$(unquote "${amount}")")
if [[ $int -lt 0 ]]; then c="$negchar"; col=$red; else c="$poschar"; col=$green; fi if [[ ${shownum} -gt 0 ]]; then num=$(printf "%10d " "${int}"); else num=""; fi
if [[ ${int} -lt 0 ]]; then c="${negchar}"; col=${red}; else c="${poschar}"; col=${green}; fi
n=$((int / scale)) n=$((int / scale))
absn=${n#-} absn=${n#-}
bar=$(while [[ $absn -gt 0 ]]; do printf "%s" "$c"; absn=$((absn - 1)); done) bar=$(while [[ ${absn} -gt 0 ]]; do printf "%s" "${c}"; absn=$((absn - 1)); done)
printf '%s\t%b%s%s%b\n' "$(unquote "$period")" "$col" "$num" "$bar" "$nocol" printf '%s\t%b%s%s%b\n' "$(unquote "${period}")" "${col}" "${num}" "${bar}" "${nocol}"
done done
if [[ $verbose -gt 0 ]]; then printcmd; fi if [[ ${verbose} -gt 0 ]]; then printcmd; fi