Tools must find their utilities when packaged

simpsonjulian · Oct 17, 2024 · 7f3e013 · 7f3e013
1 parent e628c29
commit 7f3e013
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/2sarif.rb → csv2sarif.rb b/2sarif.rb → csv2sarif.rb
diff --git a/tools.d/churn b/tools.d/churn
@@ -8,6 +8,12 @@ OUTPUT="${tmpdir}/churned"
 CSV="${tmpdir}/findings.csv"
 TOP_N_CHURNED_FILES=10
 
+if [ -x "./csv2sarif.rb" ]; then
+  csv2sarif="./csv2sarif.rb"
+else
+  csv2sarif="csv2sarif"
+fi
+
 git -C "${source}" log --format=format: --name-only --since=12.month \
  | grep -Ev '^$' \
  | sort \
@@ -18,7 +24,8 @@ git -C "${source}" log --format=format: --name-only --since=12.month \
 while read -r filename _commits; do
   printf "%s,%s,%s,%s,%s,%s\n" "top-file-churns" "note" "File has been committed to frequently. This may indicate design issues." "${filename}" 0 0 >> "$CSV"
 done < "${OUTPUT}"
-./2sarif.rb "churn" "$(git --version)" "$CSV"
+
+$csv2sarif "churn" "$(git --version)" "$CSV"
 
 # clean up
 rm -rf "${tmpdir}"
diff --git a/tools.d/lizard b/tools.d/lizard
@@ -5,6 +5,11 @@ which lizard > /dev/null || exit 1
 
 source=$1
 tmpdir=$(mktemp -d)
+if [ -x "./csv2sarif.rb" ]; then
+  csv2sarif="./csv2sarif.rb"
+else
+  csv2sarif="csv2sarif"
+fi
 
 choose() {
   local input=$1
@@ -23,7 +28,7 @@ awk -F':' '{print $2,$3, $1}' "${result}"| while read -r startline severity file
   "${filename}"  "${startline}"  0 >> "${tmpdir}"/findings.csv
 done
 
-./2sarif.rb "lizard" "$(lizard --version)" "${tmpdir}/findings.csv"
+$csv2sarif "lizard" "$(lizard --version)" "${tmpdir}/findings.csv"
 
 # clean up
 rm -rf "${tmpdir}"