From 75364d596028e1e699235abe7f43973e35229024 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Sat, 7 Sep 2024 07:11:44 +0200
Subject: [PATCH] Report correct path prefixes to logs, too

This has confused me several times during debugging.  So always call
vcs-diff-lint tool with the same set of important arguments.
---
 container/cmd | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/container/cmd b/container/cmd
index ba8a2be..f78fe34 100755
--- a/container/cmd
+++ b/container/cmd
@@ -44,28 +44,34 @@ set_linter_options()
     done
 }
 
-populate_sarif_data()
-{
-    vcs-diff-lint "${linter_options[@]}" | \
+# The first argument is path prefix to append.  The rest of given arguments is
+# passed directly to vcs-diff-lint arguments list.
+vcs_diff_lint()
+(
+    set -o pipefail
+    pp=$1
+    shift
+    vcs-diff-lint "${linter_options[@]}" "$@" | \
     csgrep \
         --strip-path-prefix ./ \
-        --prepend-path-prefix "$1/" \
-        >> "$rootdir/output.sarif.err" \
-    || true
+        --prepend-path-prefix "$pp/"
+)
+
+populate_sarif_data()
+{
+    vcs_diff_lint "$1" >> "$rootdir/output.sarif.err" || true
 }
 
 analyze_subdir()
 {
-    echo
     echo "## Linting in '$1' subdirectory ##"
-    echo
     cd "$rootdir/$1" 2>/dev/null || {
         error "Directory '$1' not found"
         result=false
         return
     }
     populate_sarif_data "$1"
-    vcs-diff-lint --print-fixed-errors "${linter_options[@]}" || result=false
+    vcs_diff_lint "$1" --print-fixed-errors || result=false
 }
 
 if test -n "$INPUT_INSTALL_RPM_PACKAGES"; then