You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/01/07 09:18:37 UTC
[07/14] git commit: reindent
reindent
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/df92f1c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/df92f1c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/df92f1c0
Branch: refs/heads/master
Commit: df92f1c0254dc9073c18bc7b76f8b9523ecd7cec
Parents: d7d95a0
Author: Holden Karau <ho...@pigscanfly.ca>
Authored: Sat Jan 4 21:48:35 2014 -0800
Committer: Holden Karau <ho...@pigscanfly.ca>
Committed: Sat Jan 4 21:48:35 2014 -0800
----------------------------------------------------------------------
sbt/sbt | 62 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/df92f1c0/sbt/sbt
----------------------------------------------------------------------
diff --git a/sbt/sbt b/sbt/sbt
index a7146e3..6d2caca 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -9,40 +9,40 @@ JAR=sbt/sbt-launch-${SBT_VERSION}.jar
printf "Checking for system sbt ["
if hash sbt 2>/dev/null; then
- printf "FOUND]\n"
- # Use System SBT
- sbt $@
+ printf "FOUND]\n"
+ # Use System SBT
+ sbt $@
else
- printf "NOT FOUND]\n"
- # Download sbt or use already downloaded
- if [ ! -d .sbtlib ]; then
- mkdir .sbtlib
- fi
- if [ ! -f ${JAR} ]; then
- # Download
- printf "Attempting to fetch sbt\n"
- if hash curl 2>/dev/null; then
+ printf "NOT FOUND]\n"
+ # Download sbt or use already downloaded
+ if [ ! -d .sbtlib ]; then
+ mkdir .sbtlib
+ fi
+ if [ ! -f ${JAR} ]; then
+ # Download
+ printf "Attempting to fetch sbt\n"
+ if hash curl 2>/dev/null; then
curl --progress-bar ${URL1} > ${JAR} || curl --progress-bar ${URL2} > ${JAR}
- elif hash wget 2>/dev/null; then
+ elif hash wget 2>/dev/null; then
wget --progress=bar ${URL1} -O ${JAR} || wget --progress=bar ${URL2} -O ${JAR}
- else
+ else
printf "You do not have curl or wget installed, please install sbt manually from http://www.scala-sbt.org/\n"
exit
- fi
- fi
- if [ ! -f ${JAR} ]; then
- # We failed to download
- printf "Our attempt to download sbt locally to {$JAR} failed. Please install sbt manually from http://www.scala-sbt.org/\n"
- exit
- fi
- printf "Launching sbt from .sbtlib\n"
- java \
- -Duser.timezone=UTC \
- -Djava.awt.headless=true \
- -Dfile.encoding=UTF-8 \
- -XX:MaxPermSize=256m \
- -Xmx1g \
- -noverify \
- -jar ${JAR} \
- "$@"
+ fi
+ fi
+ if [ ! -f ${JAR} ]; then
+ # We failed to download
+ printf "Our attempt to download sbt locally to {$JAR} failed. Please install sbt manually from http://www.scala-sbt.org/\n"
+ exit
+ fi
+ printf "Launching sbt from .sbtlib\n"
+ java \
+ -Duser.timezone=UTC \
+ -Djava.awt.headless=true \
+ -Dfile.encoding=UTF-8 \
+ -XX:MaxPermSize=256m \
+ -Xmx1g \
+ -noverify \
+ -jar ${JAR} \
+ "$@"
fi