@@ -15,21 +15,28 @@ report_results()
1515 if [[ -f setup.sh ]]; then
1616 ${SUDO:- } rm setup.sh
1717 fi
18+ if [[ -f setup.csh ]]; then
19+ ${SUDO:- } rm setup.csh
20+ fi
1821 # Prepend the OpenCoarrays license to the setup.sh script:
1922 while IFS=' ' read -r line || [[ -n " $line " ]]; do
2023 echo " # $line " >> setup.sh
2124 done < " ${opencoarrays_src_dir} /LICENSE"
22- echo " # " >> setup.sh
23- echo " # Execute this script via the following command: " >> setup.sh
24- echo " # source $install_path /setup.sh " >> setup.sh
25- echo " " >> setup.sh
25+ while IFS=' ' read -r line || [[ -n " $line " ]]; do
26+ echo " # $line " >> setup.csh
27+ done < " ${opencoarrays_src_dir} /LICENSE"
28+ echo " # " | tee -a setup.csh setup.sh
29+ echo " # Execute this script via the following command: " | tee -a setup.csh setup.sh
30+ echo " # source $install_path /setup.sh " | tee -a setup.csh setup.sh
31+ echo " " | tee -a setup.csh setup.sh
2632 gcc_install_path=$( " ${build_script} " -P gcc)
2733 if [[ -x " $gcc_install_path /bin/gfortran" ]]; then
2834 echo " if [[ -z \"\$ PATH\" ]]; then " >> setup.sh
2935 echo " export PATH=\" $gcc_install_path /bin\" " >> setup.sh
3036 echo " else " >> setup.sh
3137 echo " export PATH=\" $gcc_install_path /bin:\$ PATH\" " >> setup.sh
3238 echo " fi " >> setup.sh
39+ echo " set path = (\" $gcc_install_path \" /bin " \$ path" ) " >> setup.csh
3340 fi
3441 if [[ -d " $gcc_install_path /lib" || -d " $gcc_install_path /lib64" ]]; then
3542 gfortran_lib_paths=" $gcc_install_path /lib64/:$gcc_install_path /lib"
@@ -38,6 +45,7 @@ report_results()
3845 echo " else " >> setup.sh
3946 echo " export LD_LIBRARY_PATH=\" $gfortran_lib_paths :\$ LD_LIBRARY_PATH\" " >> setup.sh
4047 echo " fi " >> setup.sh
48+ echo " set LD_LIBRARY_PATH = (\" $gfortran_lib_paths \" /bin " \$ LD_LIBRARY_PATH" ) " >> setup.csh
4149 fi
4250 echo " " >> setup.sh
4351 mpich_install_path=$( " ${build_script} " -P mpich)
@@ -47,6 +55,7 @@ report_results()
4755 echo " else " >> setup.sh
4856 echo " export PATH=\" $mpich_install_path /bin\" :\$ PATH " >> setup.sh
4957 echo " fi " >> setup.sh
58+ echo " set path = (\" $mpich_install_path \" /bin " \$ path" ) " >> setup.csh
5059 fi
5160 cmake_install_path=$( " ${build_script} " -P cmake)
5261 if [[ -x " $cmake_install_path /bin/cmake" ]]; then
@@ -55,13 +64,15 @@ report_results()
5564 echo " else " >> setup.sh
5665 echo " export PATH=\" $cmake_install_path /bin\" :\$ PATH " >> setup.sh
5766 echo " fi " >> setup.sh
67+ echo " set path = (\" $cmake_install_path \" /bin " \$ path" ) " >> setup.csh
5868 fi
5969 flex_install_path=$( " ${build_script} " -P flex)
6070 if [[ -x " $flex_install_path /bin/flex" ]]; then
6171 echo " if [[ -z \"\$ PATH\" ]]; then " >> setup.sh
6272 echo " export PATH=\" $flex_install_path /bin\" " >> setup.sh
6373 echo " else " >> setup.sh
6474 echo " export PATH=\" $flex_install_path /bin\" :\$ PATH " >> setup.sh
75+ echo " set path = (\" $flex_install_path \" /bin " \$ path" ) " >> setup.csh
6576 echo " fi " >> setup.sh
6677 fi
6778 bison_install_path=$( " ${build_script} " -P bison)
@@ -71,6 +82,7 @@ report_results()
7182 echo " else " >> setup.sh
7283 echo " export PATH=\" $bison_install_path /bin\" :\$ PATH " >> setup.sh
7384 echo " fi " >> setup.sh
85+ echo " set path = (\" $bison_install_path \" /bin " \$ path" ) " >> setup.csh
7486 fi
7587 m4_install_path=$( " ${build_script} " -P m4)
7688 if [[ -x " $m4_install_path /bin/m4" ]]; then
@@ -79,6 +91,7 @@ report_results()
7991 echo " else " >> setup.sh
8092 echo " export PATH=\" $m4_install_path /bin\" :\$ PATH " >> setup.sh
8193 echo " fi " >> setup.sh
94+ echo " set path = (\" $m4_install_path \" /bin " \$ path" ) " >> setup.csh
8295 fi
8396 opencoarrays_install_path=" ${install_path} "
8497 if [[ -x " $opencoarrays_install_path /bin/caf" ]]; then
@@ -87,17 +100,25 @@ report_results()
87100 echo " else " >> setup.sh
88101 echo " export PATH=\" $opencoarrays_install_path /bin\" :\$ PATH " >> setup.sh
89102 echo " fi " >> setup.sh
103+ echo " set path = (\" $opencoarrays_install_path \" /bin " \$ path" ) " >> setup.csh
90104 fi
91105 if ${SUDO:- } mv setup.sh " $opencoarrays_install_path " ; then
92106 setup_sh_location=$opencoarrays_install_path
93107 else
94108 setup_sh_location=${PWD}
95109 fi
96- echo " *** Before using caf, cafrun, or build, please execute the following command ***"
97- echo " *** or add it to your login script and launch a new shell (or the equivalent ***"
98- echo " *** for your shell if you are not using a bash shell): ***"
110+ if ${SUDO:- } mv setup.csh " $opencoarrays_install_path " ; then
111+ setup_csh_location=$opencoarrays_install_path
112+ else
113+ setup_csh_location=${PWD}
114+ fi
115+ echo " *** To set up your environment for using caf and cafrun, please ***"
116+ echo " *** source the installed setup.sh file in a bash shell setup.csh ***"
117+ echo " *** if you use a C-shell as follows (or add one of the following ***"
118+ echo " *** statements to your login file: ***"
99119 echo " "
100120 echo " source $setup_sh_location /setup.sh"
121+ echo " source $setup_csh_location /setup.csh"
101122 echo " "
102123 echo " *** Installation complete. ***"
103124
0 commit comments