Skip to content

Commit 681e302

Browse files
committed
[SPARK-9633] [BUILD] SBT download locations outdated; need an update
Remove 2 defunct SBT download URLs and replace with the 1 known download URL. Also, use https. Follow up on #7792 Author: Sean Owen <[email protected]> Closes #7956 from srowen/SPARK-9633 and squashes the following commits: caa40bd [Sean Owen] Remove 2 defunct SBT download URLs and replace with the 1 known download URL. Also, use https.
1 parent e234ea1 commit 681e302

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

build/sbt-launch-lib.bash

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ dlog () {
3838

3939
acquire_sbt_jar () {
4040
SBT_VERSION=`awk -F "=" '/sbt\.version/ {print $2}' ./project/build.properties`
41-
URL1=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
42-
URL2=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
41+
URL1=https://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
4342
JAR=build/sbt-launch-${SBT_VERSION}.jar
4443

4544
sbt_jar=$JAR
@@ -51,12 +50,10 @@ acquire_sbt_jar () {
5150
printf "Attempting to fetch sbt\n"
5251
JAR_DL="${JAR}.part"
5352
if [ $(command -v curl) ]; then
54-
(curl --fail --location --silent ${URL1} > "${JAR_DL}" ||\
55-
(rm -f "${JAR_DL}" && curl --fail --location --silent ${URL2} > "${JAR_DL}")) &&\
53+
curl --fail --location --silent ${URL1} > "${JAR_DL}" &&\
5654
mv "${JAR_DL}" "${JAR}"
5755
elif [ $(command -v wget) ]; then
58-
(wget --quiet ${URL1} -O "${JAR_DL}" ||\
59-
(rm -f "${JAR_DL}" && wget --quiet ${URL2} -O "${JAR_DL}")) &&\
56+
wget --quiet ${URL1} -O "${JAR_DL}" &&\
6057
mv "${JAR_DL}" "${JAR}"
6158
else
6259
printf "You do not have curl or wget installed, please install sbt manually from http://www.scala-sbt.org/\n"

0 commit comments

Comments
 (0)