Fix macOS matrix expansion issue and bad gcc arg

Author: zbeekman

.travis.yml

@@ -14,16 +14,11 @@ env:
     - MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
     - BUILD_TYPES="Release Debug RelWithDebInfo CodeCoverage"
   matrix:
-    - GCC="6 7" OSX_PACKAGES="shellcheck gcc gcc@6 cmake"
+    - GCC="6 7" OSX_PACKAGES="shellcheck gcc gcc@6 cmake" BUILD_TYPE="cmake"
+    - GCC="6" OSX_PACKAGES="shellcheck gcc@6 cmake" BUILD_TYPE="InstallScript"
 
 matrix:
   fast_finish: true
-  include:
-    - os: osx
-      env:
-        - BUILD_TYPE="InstallScript"
-          OSX_PACKAGES="shellcheck gcc@6"
-          GCC=6
     - &ubuntu
       os: linux
       sudo: false

developer-scripts/travis/before_install.linux.sh

@@ -12,7 +12,6 @@ __file=developer-scripts/travis/install.linux.sh
 # requires `set -o errtrace`
 __caf_err_report() {
     error_code=${?}
-    local error_code
     echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
     false
     return ${error_code}

developer-scripts/travis/before_install.osx.sh

@@ -12,7 +12,6 @@ __file=developer-scripts/travis/install.linux.sh
 # requires `set -o errtrace`
 __caf_err_report() {
     error_code=${?}
-    local error_code
     echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
     false
     return ${error_code}

developer-scripts/travis/install.linux.sh

@@ -12,7 +12,6 @@ __file=developer-scripts/travis/install.linux.sh
 # requires `set -o errtrace`
 __caf_err_report() {
     error_code=${?}
-    local error_code
     echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
     false
     return ${error_code}

developer-scripts/travis/install.osx.sh

@@ -12,7 +12,6 @@ __file=developer-scripts/travis/install.osx.sh
 # requires `set -o errtrace`
 __caf_err_report() {
     error_code=${?}
-    local error_code
     echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
     false
     return ${error_code}

developer-scripts/travis/test-script.InstallScript.sh

@@ -12,7 +12,6 @@ __file=developer-scripts/travis/test-script.InstallScript.sh
 # requires `set -o errtrace`
 __caf_err_report() {
     error_code=${?}
-    local error_code
     echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
     false
     return ${error_code}

developer-scripts/travis/test-script.cmake.sh

@@ -12,7 +12,6 @@ __file=developer-scripts/travis/test-script.cmake.sh
 # requires `set -o errtrace`
 __caf_err_report() {
     error_code=${?}
-    local error_code
     echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
     false
     return ${error_code}
@@ -28,7 +27,7 @@ for version in ${GCC}; do
     export FC=gfortran-${version}
     export CC=gcc-${version}
     ${FC} --version
-    ${CC} --verions
+    ${CC} --version
     if [[ ${OS_TYPE} == [Dd]arwin* ]]; then
 	# Ideally this stuff would be in the `install:` section
 	# but puting it here simplifies the Travis code a lot