From 40f17229271725856bd46b9fb2e61f00796692c4 Mon Sep 17 00:00:00 2001
From: David Jezek <david.jezek@vsb.cz>
Date: Tue, 20 Feb 2024 11:20:29 +0100
Subject: [PATCH] fix: eclipse plugin installation and logging

---
 swi-install.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/swi-install.sh b/swi-install.sh
index 8338239..54c14e1 100755
--- a/swi-install.sh
+++ b/swi-install.sh
@@ -143,7 +143,7 @@ EOF
 	sed -i "/$logLevelLine/d" $eclipseConfigFile
 	sed -i "/-Dsun.java.command/a $logLevelLine" $eclipseConfigFile
 
-    sudo /opt/eclipse-$suffix/$altRunName -nosplash -application org.eclipse.equinox.p2.director -repository $repos -installIU $plugins -vmargs -Dlogback.configurationFile=logback.xml -Declipse.log.level=INFO
+    sudo /opt/eclipse-$suffix/$altRunName -nosplash -application org.eclipse.equinox.p2.director -repository $repos -installIU $plugins -vmargs -Dlogback.configurationFile=logback.xml -Declipse.log.level=INFO | tee plugin-install-$altRunName-$suffix.log |grep -v "] DEBUG org.apache"
 
 #	sed -i "/$logLevelLine/d" $eclipseConfigFile
 }
@@ -592,10 +592,8 @@ function installEclipseJava(){
 "https://download.eclipse.org/releases/2023-12/,\
 https://binaries.sonarsource.com/SonarLint-for-Eclipse/releases/,\
 https://download.eclipse.org/efxclipse/updates-released/3.9.0/site/,\
-https://projectlombok.org/p2,\
 https://ecd-plugin.github.io/update/" \
 "org.eclipse.fx.runtime.min.feature.feature.group,\
-org.projectlombok.feature.feature.group,\
 org.eclipse.fx.ide.feature.feature.group,\
 org.eclipse.wb.core.feature.feature.group,\
 org.eclipse.wb.core.ui.feature.feature.group,\
@@ -629,9 +627,7 @@ https://ecd-plugin.github.io/update/,\
 https://www.thymeleaf.org/eclipse-plugin-update-site/,\
 https://projectlombok.org/p2,\
 https://de-jcup.github.io/update-site-eclipse-yaml-editor/update-site/" \
-"org.projectlombok.feature.feature.group,\
-org.eclipse.eclemma.feature.feature.group,\
-org.sonarlint.eclipse.feature.feature.group,\
+"org.sonarlint.eclipse.feature.feature.group,\
 org.jboss.tools.cdi.feature.feature.group,\
 org.eclipse.wst.json_ui.feature.feature.group,\
 org.jboss.ide.eclipse.as.feature.feature.group,\
@@ -910,6 +906,18 @@ function update2024(){
     installLombok ee
 }
 
+function fix2024(){
+
+#    removeEclipseInstance ee
+#    installEclipseEE
+
+    removeEclipseInstance java
+    installEclipseJava
+
+    installLombok java
+#    installLombok ee
+}
+
 
 
 if [ $# == 0 ] ; then
-- 
GitLab