From 98534e5b6bdbb6f9a3afdf32ef62e75339084940 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@mpba.co.uk>
Date: Thu, 17 Sep 2026 11:26:28 +0100
Subject: [PATCH] M3 Security Fixes for scan command pass 32 moved scan.sh

---
 scan.sh => scripts/scan.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
 rename scan.sh => scripts/scan.sh (85%)

diff --git a/scan.sh b/scripts/scan.sh
similarity index 85%
rename from scan.sh
rename to scripts/scan.sh
index 13080e12..1e648401 100755
--- a/scan.sh
+++ b/scripts/scan.sh
@@ -3,7 +3,11 @@ set -euo pipefail
 
 SONAR_URL="http://192.168.1.2:9001"
 PROJECT="Warehouse-Management-System"
-OUTPUT="sonarqube-issues.csv"
+
+# The directory scan.sh was invoked from is the project root.
+PROJECT_DIR="$PWD"
+OUTPUT="$PROJECT_DIR/sonarqube-issues.csv"
+
 TMP=$(mktemp)
 
 trap 'rm -f "$TMP" "$TMP.new"' EXIT
@@ -13,13 +17,21 @@ if [ -z "${SONAR_TOKEN:-}" ]; then
     exit 1
 fi
 
-# Delete previous report FIRST
+if [ ! -d "$PROJECT_DIR" ]; then
+    echo "ERROR: Project directory does not exist: $PROJECT_DIR"
+    exit 1
+fi
+
+# Delete previous report FIRST.
 echo "Removing previous SonarQube report..."
 rm -f "$OUTPUT"
 
 echo
+echo "Project directory: $PROJECT_DIR"
 echo "Running SonarQube scan..."
 
+cd "$PROJECT_DIR"
+
 JAVA_HOME="/opt/homebrew/opt/openjdk" \
 PATH="/opt/homebrew/opt/openjdk/bin:$PATH" \
 sonar-scanner \