From 34147549a7ad188e5eae8d818d36ca0fe882c16f Mon Sep 17 00:00:00 2001
From: GuoQiang Li <witgo@qq.com>
Date: Thu, 5 Feb 2015 12:03:13 -0800
Subject: [PATCH] [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
---
build/mvn | 10 +++++-----
dev/check-license | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build/mvn b/build/mvn
index a87c5a2623..53babf54de 100755
--- a/build/mvn
+++ b/build/mvn
@@ -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
--
GitLab