Skip to content

Commit 1f84193

Browse files
author
Damian Rouson
committed
Correct typo that blocked Travis-CI test
1 parent 4d755f0 commit 1f84193

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ fi
125125
emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 101]"
126126

127127
[ ! -z "${arg_P}" ] && [ ! -z "${arg_U:-${arg_V:-${arg_B}}}" ] &&
128-
emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 103]"
128+
emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 102]"
129129

130130
[ ! -z "${arg_U}" ] && [ ! -z "${arg_V:-${arg_B}}" ] &&
131-
emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 104]"
131+
emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 103]"
132132

133-
[ ! -z "${arg_V}" ] && [ ! -z "${arg_B}}" ] &&
133+
[ ! -z "${arg_V}" ] && [ ! -z "${arg_B}" ] &&
134134
emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 104]"
135135

136136
### Print bootstrapped magic variables to STDERR when LOG_LEVEL

prerequisites/build-functions/set_or_print_downloader.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ set_or_print_downloader()
3333
# denominator because, for licensing reasons, OS X only has bash 3 by default.)
3434
# See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
3535
package_fetch=(
36-
"gcc:${gcc_fetch}"
37-
"wget:${ftp_or_curl}"
38-
"cmake:${wget_or_curl}"
39-
"mpich:${wget_or_curl}"
40-
"flex:${wget_or_curl}"
41-
"bison:${ftp_or_curl}"
42-
"pkg-config:${wget_or_curl}"
43-
"make:${ftp_or_curl}"
44-
"m4:${ftp_or_curl}"
45-
"subversion:${wget_or_curl}"
36+
"gcc:${gcc_fetch-}"
37+
"wget:${ftp_or_curl-}"
38+
"cmake:${wget_or_curl-}"
39+
"mpich:${wget_or_curl-}"
40+
"flex:${wget_or_curl-}"
41+
"bison:${ftp_or_curl-}"
42+
"pkg-config:${wget_or_curl-}"
43+
"make:${ftp_or_curl-}"
44+
"m4:${ftp_or_curl-}"
45+
"subversion:${wget_or_curl-}"
4646
)
4747
for package in "${package_fetch[@]}" ; do
4848
KEY="${package%%:*}"

0 commit comments

Comments
 (0)