From e30549f0e4a318929d9b32d0a036333640afce77 Mon Sep 17 00:00:00 2001
From: Matteo Valentini <matteo.valentini@nethesis.it>
Date: Thu, 19 Dec 2024 15:08:11 +0100
Subject: [PATCH] fix(build): correct jcharset library path for Tomcat setup

Update the path for the jcharset-2.0.jar library to align with the
new directory structure under /var/lib/tomcats. Adjust CLASSPATH
in setenv.sh to reference the updated location for consistency.
---
 build-images.sh                             | 2 +-
 webapp/var/lib/tomcats/webtop/bin/setenv.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-images.sh b/build-images.sh
index 6125e403..8189beeb 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -68,7 +68,7 @@ reponame="webtop-webapp"
 container=$(buildah from docker.io/library/tomcat:8-jre8)
 buildah add ${container} ${webapp_tmp_dir}/webtop /usr/local/tomcat/webapps/webtop/
 buildah add ${container} ${PWD}/webtop5-build/webtop-login/ /usr/local/tomcat/webapps/webtop/WEB-INF/classes/
-buildah add ${container} ${jcharset_tmp_dir}/jcharset-2.0/lib/jcharset-2.0.jar /usr/local/tomcat/webapps/webtop/lib/
+buildah add ${container} ${jcharset_tmp_dir}/jcharset-2.0/lib/jcharset-2.0.jar  /var/lib/tomcats/webtop/lib/
 buildah add ${container} ${PWD}/webtop5-build/ListTimeZones.class /usr/share/webtop/
 buildah add ${container} ${PWD}/webtop5-build/WebtopPassEncode.class /usr/share/webtop/
 buildah add ${container} ${PWD}/zfaker/wrappers/php /usr/share/webtop/bin/php
diff --git a/webapp/var/lib/tomcats/webtop/bin/setenv.sh b/webapp/var/lib/tomcats/webtop/bin/setenv.sh
index c650be88..47c5e239 100644
--- a/webapp/var/lib/tomcats/webtop/bin/setenv.sh
+++ b/webapp/var/lib/tomcats/webtop/bin/setenv.sh
@@ -1 +1 @@
-CLASSPATH=$CATALINA_HOME/webapps/webtop/lib//lib/jcharset-2.0.jar
+CLASSPATH=/var/lib/tomcats/webtop/lib/*.jar