From a72b0778286a43cf928acf45d311e37ed7265b16 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Fri, 17 Nov 2023 22:16:33 +0100
Subject: [PATCH] add initial easystack file for software.eessi.io + move 'eb
 --show-config' command to where eb command is available

---
 EESSI-install-software.sh                                   | 6 +++---
 .../2023.06/eessi-2023.06-eb-4.8.2-system.yml               | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-system.yml

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 234f56d518..f6087b3cfe 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -172,8 +172,6 @@ if [ ! -z "${shared_fs_path}" ]; then
     export EASYBUILD_SOURCEPATH=${shared_eb_sourcepath}:${EASYBUILD_SOURCEPATH}
 fi
 
-${EB} --show-config
-
 echo ">> Setting up \$MODULEPATH..."
 # make sure no modules are loaded
 module --force purge
@@ -190,7 +188,7 @@ fi
 pr_diff=$(ls [0-9]*.diff | head -1)
 
 # use PR patch file to determine in which easystack files stuff was added
-for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^eessi.*yml$' | egrep -v 'known-issues|missing'); do
+for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^easystacks/.*yml$' | egrep -v 'known-issues|missing'); do
 
     echo -e "Processing easystack file ${easystack_file}...\n\n"
 
@@ -200,6 +198,8 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[
     # load EasyBuild module (will be installed if it's not available yet)
     source ${TOPDIR}/load_easybuild_module.sh ${eb_version}
 
+    ${EB} --show-config
+
     echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..."
 
     if [ -f ${easystack_file} ]; then
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-system.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-system.yml
new file mode 100644
index 0000000000..5ce6a65913
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.8.2-system.yml
@@ -0,0 +1,4 @@
+easyconfigs:
+  - EasyBuild-4.8.2.eb:
+      options:
+        from-pr: 19105