From f427288c06462168522f05d615b157a8ee5ad118 Mon Sep 17 00:00:00 2001
From: Proddy <paul@derbyshire.nl>
Date: Sat, 23 Sep 2023 18:40:29 +0200
Subject: [PATCH] minor changes to sonar checks

---
 .github/workflows/sonar_check.yml |  2 +-
 .gitignore                        |  3 ++-
 scripts/run_sonar.sh              | 18 +++++++++++++-----
 sonar-project.properties          |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sonar_check.yml b/.github/workflows/sonar_check.yml
index 553c94b86..a5777a8e7 100644
--- a/.github/workflows/sonar_check.yml
+++ b/.github/workflows/sonar_check.yml
@@ -12,7 +12,7 @@ jobs:
     # if: github.repository_owner == 'emsesp'
     # if: github.repository == 'emsesp/EMS-ESP32'
     env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory
+      BUILD_WRAPPER_OUT_DIR: bw-output
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.gitignore b/.gitignore
index 7a033d0fb..199a0ce95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,8 +53,9 @@ interface/src/i18n/i18n-util.async.ts
 # sonar
 .scannerwork/
 sonar/
-build_wrapper_output_directory/
+bw-output/
 
 # entity dump results
 # dump_entities.csv
 # dump_entities.xls*
+
diff --git a/scripts/run_sonar.sh b/scripts/run_sonar.sh
index 713fbaa9f..a013efe1a 100755
--- a/scripts/run_sonar.sh
+++ b/scripts/run_sonar.sh
@@ -1,8 +1,16 @@
 #!/bin/sh
-
-# make sure you add the soanr token here
-# export SONAR_TOKEN=""
+# This is an example file to run sonar from a Linux command line
+# Run from the root of the project like `./scripts/run_sonar.sh`
+# Follow the setup in Sonar for your prpject and make sure chmod 755 +x on all the files
+# and make sure you set the token in the shell like export SONAR_TOKEN="eed5ee77e74042a275fed6f653c372452d5a21d0"
 
 make clean
-build-wrapper-linux-x86-64 --out-dir build_wrapper_output_directory make all
-sonar-scanner
+~/sonar/build-wrapper-linux-x86-64 --out-dir bw-output make all
+
+~/sonar/sonar-scanner/bin/sonar-scanner \
+  -Dsonar.organization=proddy \
+  -Dsonar.projectKey=proddy_EMS-ESP32 \
+  -Dsonar.projectName=EMS-ESP32 \
+  -Dsonar.sources="./src, ./lib/framework" \
+  -Dsonar.cfamily.build-wrapper-output=bw-output \
+  -Dsonar.host.url=https://sonarcloud.io
diff --git a/sonar-project.properties b/sonar-project.properties
index d06f4752a..6fad33dee 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,7 @@ sonar.projectKey=emsesp_EMS-ESP32
 sonar.projectName=EMS-ESP32
 sonar.projectVersion=3.6.0
 sonar.sources=./src
-sonar.cfamily.build-wrapper-output=build_wrapper_output_directory
+sonar.cfamily.build-wrapper-output=bw-output
 sonar.sourceEncoding=UTF-8
 sonar.host.url=https://sonarcloud.io
 # sonar.cfamily.threads=4