From f3f59718c40f15f69f086ccc4f37b080f997c0a8 Mon Sep 17 00:00:00 2001
From: colin <colin@noreply@nixc.us>
Date: Sat, 20 Jan 2024 21:39:51 +0000
Subject: [PATCH] Update docker/trivy/start.sh

---
 docker/trivy/start.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/docker/trivy/start.sh b/docker/trivy/start.sh
index d5fdf1b..8ae60d1 100644
--- a/docker/trivy/start.sh
+++ b/docker/trivy/start.sh
@@ -4,19 +4,13 @@ TIMEOUT=${TIMEOUT:-120m}
 IGNORE_UNFIXED=${IGNORE_UNFIXED:-false}
 LOW_PRIORITY=${LOW_PRIORITY:-true}
 
-# Use SCANNERS_ENV if provided, otherwise default to vuln, config, secret
-if [ -n "$SCANNERS_ENV" ]; then
-    OLD_IFS="$IFS"
-    IFS=',' read -r -a SCANNERS <<EOF
-$SCANNERS_ENV
-EOF
-    IFS="$OLD_IFS"
-else
-    SCANNERS=("vuln" "config" "secret")
-fi
+# Use SCANNERS_ENV if provided, otherwise default to vuln,config,secret
+SCANNERS_ENV=${SCANNERS_ENV:-"vuln,config,secret"}
 
 run_scan() {
-    for SCANNER in "${SCANNERS[@]}"; do
+    OLD_IFS="$IFS"
+    IFS=','
+    for SCANNER in $SCANNERS_ENV; do
         CURRENT_LOG="/log/trivy_scan_${SCANNER}.log"
         if [ "$LOW_PRIORITY" = "true" ]; then
             nice -n 19 trivy filesystem --skip-update --timeout $TIMEOUT --scanners $SCANNER $( [ "$IGNORE_UNFIXED" = "true" ] && echo '--ignore-unfixed' ) /mnt > $CURRENT_LOG
@@ -24,6 +18,7 @@ run_scan() {
             trivy filesystem --skip-update --timeout $TIMEOUT --scanners $SCANNER $( [ "$IGNORE_UNFIXED" = "true" ] && echo '--ignore-unfixed' ) /mnt > $CURRENT_LOG
         fi
     done
+    IFS="$OLD_IFS"
 }
 
 compare_scans() {