Skip to content

Commit d3362ac

Browse files
committed
shellcheck changes and add to CI
Signed-off-by: Orion Poplawski <orion@nwra.com>
1 parent cac80a4 commit d3362ac

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

components/compiler-families/intel-compilers-devel/SOURCES/ohpc-update-modules-intel

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Do not overwrite existing files
33
# Write the new file as rpmnew
44
testfile () {
5-
if [ -e $1 ]; then
5+
if [ -e "$1" ]; then
66
echo "$1.rpmnew"
77
else
88
echo "$1"
@@ -18,7 +18,7 @@ modprocess () {
1818
return
1919
fi
2020
fi
21-
md5sum ${modname} >> @@oneapi_manifest@@
21+
md5sum "${modname}" >> @@oneapi_manifest@@
2222
}
2323

2424
rm -f @@oneapi_manifest@@
@@ -34,8 +34,8 @@ fi
3434
# Set system defaults for default OBS oneAPI modules
3535
for tool in @@exact_deps@@; do
3636
filename=@@OHPC_MODULEDEPS@@/oneapi/${tool%%/*}/.version
37-
echo "#%Module1.0" > ${filename}
38-
echo "set ModulesVersion \"${tool##*/}\"" >> ${filename}
37+
echo "#%Module1.0" > "${filename}"
38+
echo "set ModulesVersion \"${tool##*/}\"" >> "${filename}"
3939
done
4040

4141
# Create an OpenHPC module file for each version found in compilers
@@ -56,9 +56,9 @@ for compilers in @@OHPC_MODULEDEPS@@/oneapi/compiler/2*; do
5656
echo "--> Installing modulefile for version=${ver}"
5757
# Do not overwrite existing files
5858
# Write the new file as rpmnew
59-
modname=$(testfile @@OHPC_MODULES@@/intel/$ver)
59+
modname=$(testfile @@OHPC_MODULES@@/intel/"$ver")
6060

61-
cat << EOF > ${modname}
61+
cat << EOF > "${modname}"
6262
#%Module1.0#####################################################################
6363
6464
set version "$ver"
@@ -95,12 +95,12 @@ module load "$mklver"
9595
family "compiler"
9696
EOF
9797

98-
modprocess ${modname}
98+
modprocess "${modname}"
9999

100100
# Provide standalone module for use with GNU toolchain
101-
modname=$(testfile @@OHPC_MODULEDEPS@@/gnu/mkl/$ver)
101+
modname=$(testfile @@OHPC_MODULEDEPS@@/gnu/mkl/"$ver")
102102

103-
cat << EOF > ${modname}
103+
cat << EOF > "${modname}"
104104
#%Module1.0#####################################################################
105105
106106
set version "$ver"
@@ -121,15 +121,15 @@ prepend-path MODULEPATH @@OHPC_MODULEDEPS@@/oneapi
121121
module load "$mklver"
122122
EOF
123123

124-
modprocess ${modname}
124+
modprocess "${modname}"
125125
done
126126

127127
# Set default version to match that used to build OpenHPC packages
128128
modname=$(testfile @@OHPC_MODULES@@/intel/.version)
129129

130-
cat << EOF > ${modname}
130+
cat << EOF > "${modname}"
131131
#%Module1.0#####################################################################
132132
set ModulesVersion "@@exact_intel_ver_module@@"
133133
EOF
134134

135-
modprocess ${modname}
135+
modprocess "${modname}"

tests/ci/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ whitespace-lint:
3535
@echo "Checking spec files for trailing whitespaces"
3636
cd ../../; ! git --no-pager grep -E '\s+$$' \*.spec \
3737
components/admin/prun/SOURCES/prun \
38+
components/compiler-families/intel-compilers-devel/SOURCES/ohpc-update-modules-intel \
3839
components/rms/slurm/SOURCES/slurm.epilog.clean \
3940
tests/user-env/mem_limits \
4041
tests/user-env/ompi_info \
@@ -60,6 +61,7 @@ shellcheck-lint:
6061
../../components/OHPC_setup_compiler \
6162
../../components/OHPC_setup_mpi \
6263
../../components/admin/prun/SOURCES/prun \
64+
../../components/compiler-families/intel-compilers-devel/SOURCES/ohpc-update-modules-intel \
6365
../../components/rms/slurm/SOURCES/slurm.epilog.clean \
6466
../../tests/libs/netcdf/ohpc-tests/netcdf_all_test_mpi_families \
6567
../../tests/libs/netcdf/ohpc-tests/test_mpi_families
@@ -91,4 +93,5 @@ shfmt-lint:
9193
../../tests/libs/plasma/tests/test_module
9294
shfmt -w -d \
9395
../../tests/ci/prepare-ci-environment.sh \
96+
../../components/compiler-families/intel-compilers-devel/SOURCES/ohpc-update-modules-intel \
9497
../../components/rms/slurm/SOURCES/slurm.epilog.clean

0 commit comments

Comments
 (0)