diff --git a/scripts/install_boost.sh b/scripts/install_boost.sh index 9daf7e1..b1fd10a 100755 --- a/scripts/install_boost.sh +++ b/scripts/install_boost.sh @@ -36,7 +36,7 @@ if [ -z "${base_dir}" ]; then usage; fi parallel="${parallel:-$(nproc)}" -# Modulefile pointing to system version +# Modulefile for system version if [ "$version" = "system" ]; then version=$(dpkg -s libboost-dev | grep 'Version:' | cut -d' ' -f2 | cut -d. -f1,2,3) diff --git a/scripts/install_petsc_hdf5.sh b/scripts/install_petsc_hdf5.sh index c9fa9cc..a987f0a 100755 --- a/scripts/install_petsc_hdf5.sh +++ b/scripts/install_petsc_hdf5.sh @@ -54,7 +54,7 @@ if [[ ! (${petsc_arch} = 'linux-gnu' usage fi -# Modulefile pointing to system version +# Modulefile for system version if [[ ("$petsc_version" = "system") || ("$hdf5_version" = "system") || ("$petsc_arch" = "system") ]]; then diff --git a/scripts/install_sundials.sh b/scripts/install_sundials.sh index 236b94a..08d1746 100755 --- a/scripts/install_sundials.sh +++ b/scripts/install_sundials.sh @@ -34,7 +34,7 @@ if [ -z "${base_dir}" ]; then usage; fi parallel="${parallel:-$(nproc)}" -# Modulefile pointing to system version +# Modulefile for system version if [ "$version" = "system" ]; then version=$(dpkg -s libsundials-dev | grep 'Version:' | cut -d' ' -f2 | cut -d. -f1,2,3 | cut -d+ -f1) diff --git a/scripts/install_vtk.sh b/scripts/install_vtk.sh index c826423..4bcca27 100755 --- a/scripts/install_vtk.sh +++ b/scripts/install_vtk.sh @@ -36,7 +36,7 @@ if [ -z "${base_dir}" ]; then usage; fi parallel="${parallel:-$(nproc)}" -# Modulefile pointing to system version +# Modulefile for system version if [ "$version" = "system" ]; then version="" for i in 9 8 7 6 diff --git a/scripts/install_xercesc.sh b/scripts/install_xercesc.sh index 2abc3a4..f6a4eac 100755 --- a/scripts/install_xercesc.sh +++ b/scripts/install_xercesc.sh @@ -34,7 +34,7 @@ if [ -z "${base_dir}" ]; then usage; fi parallel="${parallel:-$(nproc)}" -# Modulefile pointing to system version +# Modulefile for system version if [ "$version" = "system" ]; then version=$(dpkg -s libxerces-c-dev | grep 'Version:' | cut -d' ' -f2 | cut -d. -f1,2,3 | cut -d+ -f1) @@ -63,9 +63,6 @@ proc ModulesHelp { } { module-whatis "This adds the environment variables for xercesc ${version}" -setenv XERCESC_INCLUDE /usr/include/xercesc -setenv XERCESC_LIBRARY /usr/lib/x86_64-linux-gnu - conflict xercesc EOF exit 0 diff --git a/scripts/install_xsd.sh b/scripts/install_xsd.sh index bb0bd52..5ad310d 100755 --- a/scripts/install_xsd.sh +++ b/scripts/install_xsd.sh @@ -28,7 +28,7 @@ done if [ -z "${version}" ]; then usage; fi if [ -z "${base_dir}" ]; then usage; fi -# Modulefile pointing to system version +# Modulefile for system version if [ "$version" = "system" ]; then version=$(dpkg -s xsdcxx | grep 'Version:' | cut -d' ' -f2 | cut -d. -f1,2,3 | cut -d- -f1)