@@ -102,7 +102,7 @@ before_install:
102
102
set -o errexit
103
103
if [[ (-n ${TRAVIS_TAG}) && (${TRAVIS_OS_NAME} == osx) ]] && ${TRAVIS_SECURE_ENV_VARS} ; then
104
104
brew update > /dev/null
105
- [[ "$( brew ls --versions gpg2)" ]] || brew install gpg2
105
+ brew ls --versions gpg2 >/dev/null || brew install gpg2
106
106
brew outdated gpg2 || brew upgrade gpg2
107
107
type -P openssl || brew install openssl
108
108
fi
@@ -137,10 +137,10 @@ install:
137
137
if [[ (-n ${TRAVIS}) && (${TRAVIS_OS_NAME} == osx) ]]; then
138
138
brew update > /dev/null
139
139
140
- [[ "$( brew ls --versions shellcheck)" ]] || brew install --force-bottle shellcheck
140
+ brew ls --versions shellcheck >/dev/null || brew install --force-bottle shellcheck
141
141
brew outdated shellcheck || brew upgrade --force-bottle shellcheck
142
142
for pkg in ${OSX_PACKAGES}; do
143
- [[ "$( brew ls --versions ${pkg})" ]] || brew install ${pkg}
143
+ brew ls --versions ${pkg} >/dev/null || brew install ${pkg} || brew link --overwrite ${pkg}
144
144
brew outdated ${pkg} || brew upgrade ${pkg}
145
145
done
146
146
if [[ ${BUILD_TYPE} == InstallScript ]]; then # uninstall some stuff if present
@@ -150,9 +150,7 @@ install:
150
150
else
151
151
wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}"
152
152
brew install --force-bottle ${MPICH_BOT_URL_TAIL}
153
- if ! [[ "$(brew ls --versions mpich)" ]]; then
154
- brew install --force-bottle mpich
155
- fi
153
+ brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
156
154
fi
157
155
mpif90 --version || mpif90 -show || true
158
156
mpicc --version || mpicc -show || true
0 commit comments