From 5c5aa1daa36a022a404ef9fede2ca21c628e7694 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Mon, 10 Oct 2022 06:55:25 +0200 Subject: xlocate: output aligned, don't show "git grep" column Disable the column number for "git grep" too, and pipe through column for nicer aligned output. Before: % ./xlocate /lib/libEGL MesaLib-devel-22.1.7_1 5:/usr/lib/libEGL_mesa.so -> /usr/lib/libEGL_mesa.so.0 jetbrains-jdk-bin-11.0.15b2043.56_1 20:/usr/lib/jvm/jbrsdk/lib/libEGL.so libglvnd-1.4.0_1 5:/usr/lib/libEGL.so.1 -> /usr/lib/libEGL.so.1.1.0 libglvnd-1.4.0_1 5:/usr/lib/libEGL.so.1.1.0 libglvnd-devel-1.4.0_1 5:/usr/lib/libEGL.so -> /usr/lib/libEGL.so.1 mesa-22.1.7_1 5:/usr/lib/libEGL_mesa.so.0 -> /usr/lib/libEGL_mesa.so.0.0.0 mesa-22.1.7_1 5:/usr/lib/libEGL_mesa.so.0.0.0 nvidia-libs-515.65.01_1 5:/usr/lib/libEGL_nvidia.so.0 -> /usr/lib/libEGL_nvidia.so.515.65.01 nvidia-libs-515.65.01_1 5:/usr/lib/libEGL_nvidia.so.515.65.01 nvidia390-libs-390.154_1 5:/usr/lib/libEGL_nvidia.so.0 -> /usr/lib/libEGL_nvidia.so.390.154 nvidia390-libs-390.154_1 5:/usr/lib/libEGL_nvidia.so.390.154 nvidia470-libs-470.141.03_1 5:/usr/lib/libEGL_nvidia.so.0 -> /usr/lib/libEGL_nvidia.so.470.141.03 nvidia470-libs-470.141.03_1 5:/usr/lib/libEGL_nvidia.so.470.141.03 After: % ./xlocate /lib/libEGL MesaLib-devel-22.1.7_1 /usr/lib/libEGL_mesa.so -> /usr/lib/libEGL_mesa.so.0 jetbrains-jdk-bin-11.0.15b2043.56_1 /usr/lib/jvm/jbrsdk/lib/libEGL.so libglvnd-1.4.0_1 /usr/lib/libEGL.so.1 -> /usr/lib/libEGL.so.1.1.0 libglvnd-1.4.0_1 /usr/lib/libEGL.so.1.1.0 libglvnd-devel-1.4.0_1 /usr/lib/libEGL.so -> /usr/lib/libEGL.so.1 mesa-22.1.7_1 /usr/lib/libEGL_mesa.so.0 -> /usr/lib/libEGL_mesa.so.0.0.0 mesa-22.1.7_1 /usr/lib/libEGL_mesa.so.0.0.0 nvidia-libs-515.65.01_1 /usr/lib/libEGL_nvidia.so.0 -> /usr/lib/libEGL_nvidia.so.515.65.01 nvidia-libs-515.65.01_1 /usr/lib/libEGL_nvidia.so.515.65.01 nvidia390-libs-390.154_1 /usr/lib/libEGL_nvidia.so.0 -> /usr/lib/libEGL_nvidia.so.390.154 nvidia390-libs-390.154_1 /usr/lib/libEGL_nvidia.so.390.154 nvidia470-libs-470.141.03_1 /usr/lib/libEGL_nvidia.so.0 -> /usr/lib/libEGL_nvidia.so.470.141.03 nvidia470-libs-470.141.03_1 /usr/lib/libEGL_nvidia.so.470.141.03 Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com> Closes: #265 [via git-merge-pr] --- xlocate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xlocate') diff --git a/xlocate b/xlocate index 7294790..90ba621 100755 --- a/xlocate +++ b/xlocate @@ -87,8 +87,8 @@ if [ -d "$XLOCATE_GIT" ]; then echo "xlocate: database outdated, please run xlocate -g." 1>&2 fi fi - $GIT_CMD -c grep.lineNumber=false --git-dir="$XLOCATE_GIT" grep -- "$@" @ | - sed 's/^@://; s/:/\t/' | grep . + $GIT_CMD -c grep.lineNumber=false -c grep.column=false --git-dir="$XLOCATE_GIT" grep -- "$@" @ | + sed 's/^@://' | column -ts: -l2 | grep . else echo "xlocate: database not found, please use xlocate -S." 1>&2 exit 1 -- cgit 1.4.1