Merge pull request #653 from ocaisa/lmod_wrapper_archdetect

trz42 · web-flow · commit a5672197a049 · 2024-08-08T14:56:44.000+02:00
Add Lmod-friendly wrapper for eessi_archdetect.sh
diff --git a/init/lmod_eessi_archdetect_wrapper.sh b/init/lmod_eessi_archdetect_wrapper.sh
@@ -0,0 +1,2 @@
+# This can be leveraged by the source_sh() feature of Lmod
+export EESSI_ARCHDETECT_OPTIONS=$($(dirname $(readlink -f $BASH_SOURCE))/eessi_archdetect.sh -a cpupath)
diff --git a/install_scripts.sh b/install_scripts.sh
@@ -86,7 +86,7 @@ TOPDIR=$(dirname $(realpath $0))
 # Copy for init directory
 init_files=(
     bash eessi_archdetect.sh eessi_defaults eessi_environment_variables eessi_software_subdir_for_host.py
-    minimal_eessi_env README.md test.py
+    minimal_eessi_env README.md test.py lmod_eessi_archdetect_wrapper.sh
 )
 copy_files_by_list ${TOPDIR}/init ${INSTALL_PREFIX}/init "${init_files[@]}"
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# This can be leveraged by the source_sh() feature of Lmod`
	`2`	`+export EESSI_ARCHDETECT_OPTIONS=$($(dirname $(readlink -f $BASH_SOURCE))/eessi_archdetect.sh -a cpupath)`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ TOPDIR=$(dirname $(realpath $0))`
`86`	`86`	`# Copy for init directory`
`87`	`87`	`init_files=(`
`88`	`88`	`bash eessi_archdetect.sh eessi_defaults eessi_environment_variables eessi_software_subdir_for_host.py`
`89`		`- minimal_eessi_env README.md test.py`
	`89`	`+ minimal_eessi_env README.md test.py lmod_eessi_archdetect_wrapper.sh`
`90`	`90`	`)`
`91`	`91`	`copy_files_by_list ${TOPDIR}/init ${INSTALL_PREFIX}/init "${init_files[@]}"`
`92`	`92`