diff options
author | GuoQiang Li <witgo@qq.com> | 2015-02-05 12:03:13 -0800 |
---|---|---|
committer | Patrick Wendell <patrick@databricks.com> | 2015-02-05 12:03:13 -0800 |
commit | 34147549a7ad188e5eae8d818d36ca0fe882c16f (patch) | |
tree | 6440ae2a19d1115dcc02d368b20cdc6bf64b5733 | |
parent | 4d74f0601a2465b0d2273a8bcc716b304584831f (diff) | |
download | spark-34147549a7ad188e5eae8d818d36ca0fe882c16f.tar.gz spark-34147549a7ad188e5eae8d818d36ca0fe882c16f.tar.bz2 spark-34147549a7ad188e5eae8d818d36ca0fe882c16f.zip |
[SPARK-5474][Build]curl should support URL redirection in build/mvn
Author: GuoQiang Li <witgo@qq.com>
Closes #4263 from witgo/SPARK-5474 and squashes the following commits:
ef397ff [GuoQiang Li] review commits
a398324 [GuoQiang Li] curl should support URL redirection in build/mvn
-rwxr-xr-x | build/mvn | 10 | ||||
-rwxr-xr-x | dev/check-license | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -34,14 +34,14 @@ install_app() { local binary="${_DIR}/$3" # setup `curl` and `wget` silent options if we're running on Jenkins - local curl_opts="" + local curl_opts="-L" local wget_opts="" if [ -n "$AMPLAB_JENKINS" ]; then - curl_opts="-s" - wget_opts="--quiet" + curl_opts="-s ${curl_opts}" + wget_opts="--quiet ${wget_opts}" else - curl_opts="--progress-bar" - wget_opts="--progress=bar:force" + curl_opts="--progress-bar ${curl_opts}" + wget_opts="--progress=bar:force ${wget_opts}" fi if [ -z "$3" -o ! -f "$binary" ]; then diff --git a/dev/check-license b/dev/check-license index a006f65710..39943f882b 100755 --- a/dev/check-license +++ b/dev/check-license @@ -31,7 +31,7 @@ acquire_rat_jar () { printf "Attempting to fetch rat\n" JAR_DL="${JAR}.part" if [ $(command -v curl) ]; then - curl --silent "${URL}" > "$JAR_DL" && mv "$JAR_DL" "$JAR" + curl -L --silent "${URL}" > "$JAR_DL" && mv "$JAR_DL" "$JAR" elif [ $(command -v wget) ]; then wget --quiet ${URL} -O "$JAR_DL" && mv "$JAR_DL" "$JAR" else |