Merge pull request #456 from sourceryinstitute/issue-455-install-sh-fix

Issue 455 install.sh fix for CentOS 6

 -Fixes #455 (mostly)

Author: zbeekman

CMakeLists.txt

@@ -216,7 +216,7 @@ if ( (NOT MPI_C_FOUND) OR (NOT MPI_Fortran_FOUND) OR (NOT MPIEXEC))
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE DEFAULT_MPICH_INSTALL_LOC
     OUTPUT_QUIET
-    OUTPUT_STRIP_TRAILING_WHITES_SPACE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   find_program (MY_MPI_EXEC NAMES mpirun mpiexec lamexec srun
     PATHS "${DEFAULT_MPICH_INSTALL_LOC}" ENV PATH

prerequisites/install-functions/find_or_install.sh

@@ -35,7 +35,7 @@ find_or_install()
   if type "$executable" >& /dev/null; then
     printf "yes.\n"
     package_in_path=true
-    package_version_in_path=$("$executable" --version|head -1)
+    package_version_in_path=$( ("${executable}" --version 2>/dev/null || "${executable}" -V) | head -1)
   else
     printf "no.\n"
     package_in_path=false

prerequisites/stack.sh

@@ -99,8 +99,8 @@ function stack_size
         return 1
     fi
     # TODO: revise the eval below to eliminate the need for this pop/push
-    # sequene, which is a workaround to prevent an error that occurs with 
-    # if the stack is new and has not been the target of a stack_push. 
+    # sequene, which is a workaround to prevent an error that occurs with
+    # if the stack is new and has not been the target of a stack_push.
     stack_push $1 __push_junk
     stack_pop $1 __pop_trash
     eval "$2"='$'"{#_stack_$1[*]}"
@@ -112,7 +112,7 @@ function no_such_stack
     stack_exists "$1"
     ret=$?
     declare -i x
-    let x="1-$ret"
+    let x="1-$ret" || true
     return $x
 }
 
@@ -183,8 +183,7 @@ function stack_print
 
     while (( _i > 0 ))
     do
-       (( _i = _i - 1 )) || true
-        eval 'e=$'"{_stack_$1[$_i]}"
+        eval 'e=$'"{_stack_$1[$((--_i))]}" # pre-decrement
 	# shellcheck  disable=SC2154
         tmp="$tmp $e"
     done
@@ -210,13 +209,8 @@ function stack_new
         return 1
     fi
 
-    if [[ $(uname) == "Darwin" ]]; then
-      eval "declare -ag _stack_$1" >& /dev/null || true
-      eval "declare -ig _stack_$1_i" >& /dev/null || true
-    else
-      eval "declare -ag _stack_$1" >& /dev/null
-      eval "declare -ig _stack_$1_i" >& /dev/null
-    fi
+    eval "_stack_$1=()"
+    eval "_stack_$1_i=0"
 
     variableName="_stack_$1_i"
     variableVal="0"