Skip to content

Commit d7d635d

Browse files
authored
Merge branch '2023.06-software.eessi.io' into rebuild_lammps_generic
2 parents ecbc361 + 1357775 commit d7d635d

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

EESSI-remove-software.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,11 @@ if [ $EUID -eq 0 ]; then
131131
rm -rf ${app_dir}
132132
rm -rf ${app_module}
133133
# recreate the installation directory and do an ls on the first-level subdirectories to work around
134-
# permission denied issues when rebuilding the package (see https://github.com/EESSI/software-layer/issues/556)
134+
# permission issues when reinstalling the application (see https://github.com/EESSI/software-layer/issues/556)
135135
echo_yellow "Recreating an empty ${app_dir}..."
136136
mkdir -p ${app_dir}
137+
# these subdirs don't (and shouldn't) exist, but we need to do the ls anyway as a workaround,
138+
# so redirect to /dev/null and ignore the exit code
137139
ls ${app_subdirs} >& /dev/null || true
138140
done
139141
else

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml

+4
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,7 @@ easyconfigs:
4545
options:
4646
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22145
4747
from-commit: 31478e5c9869de3add74d0a02dd5df01ea65b21e
48+
- archspec-0.2.5-GCCcore-12.3.0.eb:
49+
options:
50+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22235
51+
from-commit: 01dd97ea62fe4d7d0df040ede3af03eb2f1b8641

0 commit comments

Comments
 (0)