From 74ff7582210f35ad252128464445ec121d0895c8 Mon Sep 17 00:00:00 2001 From: Kwabena Amponsah Date: Fri, 1 May 2026 19:29:28 +0100 Subject: [PATCH 1/2] Fix XSD 4.2 extraction --- scripts/custom/install_xsd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/custom/install_xsd.sh b/scripts/custom/install_xsd.sh index 0c36e52..3832079 100755 --- a/scripts/custom/install_xsd.sh +++ b/scripts/custom/install_xsd.sh @@ -62,7 +62,7 @@ mkdir -p ${install_dir} if version_lt "${version}" '4.2.0'; then tar -xjf xsd-${version}-x86_64-linux-gnu.tar.bz2 -C ${install_dir} --strip-components=1 else - tar -xJf xsd-${version}-x86_64-linux-glibc2.31.tar.xz -C ${install_dir} --strip-components=1 + tar -xJf xsd-${version}-x86_64-linux-glibc2.31.tar.xz -C ${install_dir} --strip-components=3 fi # Add modulefile From 1bacf2f9c90d29ca2bbbacacada6c21bc9f0f70e Mon Sep 17 00:00:00 2001 From: Kwabena Amponsah Date: Fri, 1 May 2026 19:49:09 +0100 Subject: [PATCH 2/2] Restrict xsd sanity checks to executable --- scripts/custom/install_xsd.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/custom/install_xsd.sh b/scripts/custom/install_xsd.sh index 3832079..321d892 100755 --- a/scripts/custom/install_xsd.sh +++ b/scripts/custom/install_xsd.sh @@ -75,8 +75,7 @@ cat < ${version} ## proc ModulesTest { } { set paths "[getenv XSD_ROOT] - [getenv XSD_ROOT]/bin - [getenv XSD_ROOT]/libxsd" + [getenv XSD_ROOT]/bin" foreach path \$paths { if { ![file exists \$path] } { @@ -97,10 +96,6 @@ setenv XSD_ROOT ${install_dir} prepend-path PATH ${install_dir}/bin -prepend-path INCLUDE ${install_dir}/libxsd -prepend-path C_INCLUDE_PATH ${install_dir}/libxsd -prepend-path CPLUS_INCLUDE_PATH ${install_dir}/libxsd - prepend-path CMAKE_PREFIX_PATH ${install_dir} conflict xsd