From 0abe6c2d8109b1c1f590ee5dd2f340d59cbdd240 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 1 Nov 2022 19:31:45 -0400 Subject: xlocate: handle lack of column(1) gracefully --- xlocate | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'xlocate') diff --git a/xlocate b/xlocate index 90ba621..e58fee8 100755 --- a/xlocate +++ b/xlocate @@ -27,6 +27,12 @@ else PROGRESS=cat fi +if command -v column >/dev/null; then + COLUMN="column -ts: -l2" +else + COLUMN='sed s/:/\t/' +fi + xupdategit() { set -e DIR=$(mktemp -dt xlocate.XXXXXX) @@ -88,7 +94,7 @@ if [ -d "$XLOCATE_GIT" ]; then fi fi $GIT_CMD -c grep.lineNumber=false -c grep.column=false --git-dir="$XLOCATE_GIT" grep -- "$@" @ | - sed 's/^@://' | column -ts: -l2 | grep . + sed 's/^@://' | $COLUMN | grep . else echo "xlocate: database not found, please use xlocate -S." 1>&2 exit 1 -- cgit 1.4.1