72
72
num_threads=$2
73
73
fi
74
74
75
- # Verify that the top-level OpenCoarrays source diretory is either present working directory
75
+ # Verify that the top-level OpenCoarrays source directory is either present working directory
76
76
# or is specified by a valid in the OPENCOARRAYS_SRC_DIR environment variable
77
77
if [[ -d " $OPENCOARRAYS_SRC_DIR " ]]; then
78
78
opencoarrays_src_dir=$OPENCOARRAYS_SRC_DIR
@@ -92,7 +92,7 @@ if [[ ! -x "$build_script" ]]; then
92
92
echo " $this_script : $build_script script does not exist or the user lacks executable permission for it."
93
93
echo " $this_script : Please run this_script in the top-level OpenCoarrays source directory or set the"
94
94
echo " $this_script : OPENCOARRAYS_SRC_DIR environment variable to the top-level OpenCoarrays source path."
95
- echo " $this_script : If you have specified an installation director that requires aminstrative privileges,"
95
+ echo " $this_script : If you have specified an installation director that requires administrative privileges,"
96
96
echo " $this_script : please prepend 'sudo -E' to your invocation of the script [exit 20]."
97
97
exit 20
98
98
fi
@@ -341,7 +341,7 @@ find_or_install()
341
341
export FC=gfortran
342
342
export CC=gcc
343
343
export CXX=g++
344
- stack_push acceptable_in_path $package $exectuable
344
+ stack_push acceptable_in_path $package $executable
345
345
# Remove $package from the dependency stack
346
346
stack_pop dependency_pkg package_done
347
347
stack_pop dependency_exe executable_done
@@ -528,24 +528,17 @@ find_or_install()
528
528
echo " $this_script : Ready to build $package executable $executable in $package_install_path "
529
529
fi
530
530
531
- printf " $this_script : Ok to downloand , build, and install $package from source? (y/n) "
531
+ printf " $this_script : Ok to download , build, and install $package from source? (y/n) "
532
532
read proceed_with_build
533
533
534
534
if [[ $proceed_with_build != " y" ]]; then
535
-
536
- printf " \n $this_script : OpenCoarrays installation requires $package . Aborting. [exit 70]\n"
535
+ printf " y\n "
536
+ printf " $this_script : OpenCoarrays installation requires $package . Aborting. [exit 70]\n"
537
537
exit 70
538
538
539
539
else # permission granted to build
540
+ printf " n\n"
540
541
541
- # script_installed_gcc=`stack_print script_installed | grep gcc`
542
- # if [[ ! -z $script_installed_gcc ]]; then
543
- # gcc_install_path=`./build gcc --default --query-path`
544
- # CC=$gcc_install_path/bin/gcc
545
- # CXX=$gcc_install_path/bin/g++
546
- # FC=$gcc_install_path/bin/gfortran
547
- # fi
548
-
549
542
if [[ -z " $CC " ]]; then
550
543
CC=gcc
551
544
fi
@@ -641,7 +634,7 @@ print_header()
641
634
echo " "
642
635
tree $opencoarrays_src_dir /doc/dependency_tree | tail -n+2
643
636
echo " "
644
- echo " *** All prequisites will be downloaded to, built in, and installed in ***"
637
+ echo " *** All prerequisites will be downloaded to, built in, and installed in ***"
645
638
echo " $opencoarrays_src_dir /install_prerequisites"
646
639
printf " *** OpenCoarrays will be installed "
647
640
if [[ " $install_path " == " $opencoarrays_src_dir /opencoarrays-installation" ]]; then
@@ -652,9 +645,10 @@ print_header()
652
645
fi
653
646
printf " Ready to proceed? (y/n)"
654
647
read install_now
648
+ printf " \n"
655
649
656
650
if [[ " $install_now " != " y" ]]; then
657
- printf " \n $this_script : Aborting. [exit 85]\n"
651
+ printf " $this_script : Aborting. [exit 85]\n"
658
652
exit 85
659
653
fi
660
654
}
@@ -695,7 +689,7 @@ report_results()
695
689
echo " # $line " >> $install_path /setup.sh
696
690
done < " $opencoarrays_src_dir /COPYRIGHT-BSD3"
697
691
echo " # " >> $install_path /setup.sh
698
- echo " # Execute this script via the folowing commands: " >> $install_path /setup.sh
692
+ echo " # Execute this script via the following commands: " >> $install_path /setup.sh
699
693
echo " # cd $install_path " >> $install_path /setup.sh
700
694
echo " # source setup.sh " >> $install_path /setup.sh
701
695
echo " " >> $install_path /setup.sh
0 commit comments