From b8173fc41bd2f0b10197bb35df92af66d6e95843 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Wed, 9 May 2012 09:40:10 -0400 Subject: [PATCH] Removed autodownload from the scripts. --- src/linux/sbt | 13 ++++--------- src/linux/sbt-launch-lib.bash | 11 +++-------- src/universal/bin/sbt | 11 +++-------- src/universal/bin/sbt-launch-lib.bash | 11 +++-------- 4 files changed, 13 insertions(+), 33 deletions(-) diff --git a/src/linux/sbt b/src/linux/sbt index f0dc35905..3aaadec93 100755 --- a/src/linux/sbt +++ b/src/linux/sbt @@ -43,7 +43,7 @@ declare -r sbt_release_version=0.11.3 unset sbt_rc_version # declare -r sbt_rc_version= declare -r sbt_snapshot_version=0.11.4-SNAPSHOT -declare -r sbt_snapshot_baseurl="http://typesafe.artifactoryonline.com/typesafe/ivy-snapshots/org.scala-tools.sbt/sbt-launch/" +declare -r sbt_snapshot_baseurl="http://typesafe.artifactoryonline.com/typesafe/ivy-snapshots/org.scala-sbt/sbt-launch/" declare -r default_java_opts="-Dfile.encoding=UTF8" declare -r default_sbt_opts="-XX:+CMSClassUnloadingEnabled" @@ -191,17 +191,12 @@ download_url () { local url="$1" local jar="$2" - echo "Downloading sbt launcher $sbt_version:" + echo "Cannot find sbt launcher $sbt_version" + echo "Please download: " echo " From $url" echo " To $jar" - mkdir -p $(dirname "$jar") && { - if which curl >/dev/null; then - curl --silent "$url" --output "$jar" - elif which wget >/dev/null; then - wget --quiet -O "$jar" "$url" - fi - } && [[ -f "$jar" ]] + exit 1 } acquire_sbt_jar () { diff --git a/src/linux/sbt-launch-lib.bash b/src/linux/sbt-launch-lib.bash index 254ebbb81..3e95533a9 100644 --- a/src/linux/sbt-launch-lib.bash +++ b/src/linux/sbt-launch-lib.bash @@ -70,17 +70,12 @@ download_url () { local url="$1" local jar="$2" - echo "Downloading sbt launcher $sbt_version:" + echo "Cannot find sbt launcher $sbt_version" + echo "Please download: " echo " From $url" echo " To $jar" - mkdir -p $(dirname "$jar") && { - if which curl >/dev/null; then - curl --silent "$url" --output "$jar" - elif which wget >/dev/null; then - wget --quiet -O "$jar" "$url" - fi - } && [[ -f "$jar" ]] + exit 1 } acquire_sbt_jar () { diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt index 1402b2442..fb81d154e 100755 --- a/src/universal/bin/sbt +++ b/src/universal/bin/sbt @@ -192,17 +192,12 @@ download_url () { local url="$1" local jar="$2" - echo "Downloading sbt launcher $sbt_version:" + echo "Cannot find sbt launcher $sbt_version" + echo "Please download: " echo " From $url" echo " To $jar" - mkdir -p $(dirname "$jar") && { - if which curl >/dev/null; then - curl --silent "$url" --output "$jar" - elif which wget >/dev/null; then - wget --quiet -O "$jar" "$url" - fi - } && [[ -f "$jar" ]] + exit 1 } acquire_sbt_jar () { diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash index 4f3c367bd..9acf48da2 100755 --- a/src/universal/bin/sbt-launch-lib.bash +++ b/src/universal/bin/sbt-launch-lib.bash @@ -70,17 +70,12 @@ download_url () { local url="$1" local jar="$2" - echo "Downloading sbt launcher $sbt_version:" + echo "Cannot find sbt launcher $sbt_version" + echo "Please download: " echo " From $url" echo " To $jar" - mkdir -p $(dirname "$jar") && { - if which curl >/dev/null; then - curl --silent "$url" --output "$jar" - elif which wget >/dev/null; then - wget --quiet -O "$jar" "$url" - fi - } && [[ -f "$jar" ]] + exit 1 } acquire_sbt_jar () {