File tree Expand file tree Collapse file tree 1 file changed +6
-9
lines changed
prerequisites/install-functions Expand file tree Collapse file tree 1 file changed +6
-9
lines changed Original file line number Diff line number Diff line change 1
1
# shellcheck shell=bash disable=SC2154,SC2129,SC2148
2
2
report_results ()
3
3
{
4
- type_FC=` type ${FC} `
5
- fully_qualified_FC=" /${type_FC#*/ } "
4
+ fully_qualified_FC=" $( type -P " ${FC} " ) "
6
5
if [[ ${fully_qualified_FC} != * gfortran* ]]; then
7
6
emergency " report_results.sh: non-gfortran compiler: \$ {fully_qualified_FC}=${fully_qualified_FC} "
8
7
fi
9
8
# Set path_to_FC fully-qualified gfortran location
10
- compiler_install_root=" ${fully_qualified_FC%% bin/ gfortran* } "
9
+ compiler_install_root=" ${fully_qualified_FC% bin/ gfortran* } "
11
10
12
- type_MPIFC=` type ${MPIFC} `
13
- fully_qualified_MPIFC=" /${type_MPIFC#*/ } "
14
- mpi_install_root=" ${fully_qualified_MPIFC%% bin/ mpif90* } "
11
+ fully_qualified_MPIFC=" $( type -P " ${MPIFC} " ) "
12
+ mpi_install_root=" ${fully_qualified_MPIFC% bin/ mpif90* } "
15
13
16
- type_CMAKE=` type ${CMAKE} `
17
- fully_qualified_CMAKE=" /${type_CMAKE#*/ } "
18
- cmake_install_path=" ${fully_qualified_CMAKE%%/ cmake* } "
14
+ fully_qualified_CMAKE=" $( type -P " ${CMAKE} " ) "
15
+ cmake_install_path=" ${fully_qualified_CMAKE%/ cmake* } "
19
16
20
17
# Report installation success or failure and record locations for software stack:
21
18
if [[ -x " ${install_path%/ } /bin/caf" && -x " ${install_path%/ } /bin/cafrun" ]]; then
You can’t perform that action at this time.
0 commit comments