git: a9237f43dd8c - main - devel/sonar-scanner-cli: Fix scanning on FreeBSD

From: Alexander Leidinger <netchild_at_FreeBSD.org>
Date: Wed, 20 Nov 2024 12:57:32 UTC
The branch main has been updated by netchild:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a9237f43dd8cf111f0ca8b67e933960115adb6c6

commit a9237f43dd8cf111f0ca8b67e933960115adb6c6
Author:     Alexander Leidinger <netchild@FreeBSD.org>
AuthorDate: 2024-11-20 12:53:26 +0000
Commit:     Alexander Leidinger <netchild@FreeBSD.org>
CommitDate: 2024-11-20 12:57:28 +0000

    devel/sonar-scanner-cli: Fix scanning on FreeBSD
    
    - pretent to be linux (kubernetes files will still trigger an
      exception and abort the scan, as the kybernets part ignores
      the OS setting)
    - prevent the download of java from the sonarqube server and
      use the local java
---
 devel/sonar-scanner-cli/Makefile               | 2 +-
 devel/sonar-scanner-cli/files/sonar-scanner.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devel/sonar-scanner-cli/Makefile b/devel/sonar-scanner-cli/Makefile
index 5803f2b543d8..c880c791247b 100644
--- a/devel/sonar-scanner-cli/Makefile
+++ b/devel/sonar-scanner-cli/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sonar-scanner-cli
 DISTVERSION=	6.2.1.4610
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel security www java
 MASTER_SITES=	https://binaries.sonarsource.com/Distribution/${PORTNAME}/
 
diff --git a/devel/sonar-scanner-cli/files/sonar-scanner.in b/devel/sonar-scanner-cli/files/sonar-scanner.in
index 1b72d867a5bf..8e6d1a588a9d 100644
--- a/devel/sonar-scanner-cli/files/sonar-scanner.in
+++ b/devel/sonar-scanner-cli/files/sonar-scanner.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-exec /bin/sh %%PREFIX%%/%%APP_DIR%%/bin/sonar-scanner "$@"
+exec /bin/sh %%PREFIX%%/%%APP_DIR%%/bin/sonar-scanner -Dsonar.scanner.os=linux -Dsonar.scanner.javaExePath=%%LOCALBASE%%/bin/java "$@"