7272 num_threads=$2
7373fi
7474
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
7676# or is specified by a valid in the OPENCOARRAYS_SRC_DIR environment variable
7777if [[ -d " $OPENCOARRAYS_SRC_DIR " ]]; then
7878 opencoarrays_src_dir=$OPENCOARRAYS_SRC_DIR
@@ -92,7 +92,7 @@ if [[ ! -x "$build_script" ]]; then
9292 echo " $this_script : $build_script script does not exist or the user lacks executable permission for it."
9393 echo " $this_script : Please run this_script in the top-level OpenCoarrays source directory or set the"
9494 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,"
9696 echo " $this_script : please prepend 'sudo -E' to your invocation of the script [exit 20]."
9797 exit 20
9898fi
@@ -341,7 +341,7 @@ find_or_install()
341341 export FC=gfortran
342342 export CC=gcc
343343 export CXX=g++
344- stack_push acceptable_in_path $package $exectuable
344+ stack_push acceptable_in_path $package $executable
345345 # Remove $package from the dependency stack
346346 stack_pop dependency_pkg package_done
347347 stack_pop dependency_exe executable_done
@@ -528,24 +528,17 @@ find_or_install()
528528 echo " $this_script : Ready to build $package executable $executable in $package_install_path "
529529 fi
530530
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) "
532532 read proceed_with_build
533533
534534 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"
537537 exit 70
538538
539539 else # permission granted to build
540+ printf " n\n"
540541
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-
549542 if [[ -z " $CC " ]]; then
550543 CC=gcc
551544 fi
@@ -641,7 +634,7 @@ print_header()
641634 echo " "
642635 tree $opencoarrays_src_dir /doc/dependency_tree | tail -n+2
643636 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 ***"
645638 echo " $opencoarrays_src_dir /install_prerequisites"
646639 printf " *** OpenCoarrays will be installed "
647640 if [[ " $install_path " == " $opencoarrays_src_dir /opencoarrays-installation" ]]; then
@@ -652,9 +645,10 @@ print_header()
652645 fi
653646 printf " Ready to proceed? (y/n)"
654647 read install_now
648+ printf " \n"
655649
656650 if [[ " $install_now " != " y" ]]; then
657- printf " \n $this_script : Aborting. [exit 85]\n"
651+ printf " $this_script : Aborting. [exit 85]\n"
658652 exit 85
659653 fi
660654}
@@ -695,7 +689,7 @@ report_results()
695689 echo " # $line " >> $install_path /setup.sh
696690 done < " $opencoarrays_src_dir /COPYRIGHT-BSD3"
697691 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
699693 echo " # cd $install_path " >> $install_path /setup.sh
700694 echo " # source setup.sh " >> $install_path /setup.sh
701695 echo " " >> $install_path /setup.sh
0 commit comments