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:39 UTC
[09/14] git commit: Fix indentatation
Fix indentatation
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5a598b2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5a598b2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5a598b2d
Branch: refs/heads/master
Commit: 5a598b2d7b72db7f732a63e6e92d54786f68ee1e
Parents: d86dc74
Author: Holden Karau <ho...@pigscanfly.ca>
Authored: Sun Jan 5 22:07:32 2014 -0800
Committer: Holden Karau <ho...@pigscanfly.ca>
Committed: Sun Jan 5 22:07:32 2014 -0800
----------------------------------------------------------------------
sbt/sbt | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/5a598b2d/sbt/sbt
----------------------------------------------------------------------
diff --git a/sbt/sbt b/sbt/sbt
index 09cc5a0..0951e9d 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -16,28 +16,28 @@ else
printf "NOT FOUND]\n"
# Download sbt or use already downloaded
if [ ! -d .sbtlib ]; then
- mkdir .sbtlib
+ 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
- wget --progress=bar ${URL1} -O ${JAR} || wget --progress=bar ${URL2} -O ${JAR}
- else
- printf "You do not have curl or wget installed, please install sbt manually from http://www.scala-sbt.org/\n"
- exit -1
- fi
+ # 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
+ wget --progress=bar ${URL1} -O ${JAR} || wget --progress=bar ${URL2} -O ${JAR}
+ else
+ printf "You do not have curl or wget installed, please install sbt manually from http://www.scala-sbt.org/\n"
+ exit -1
+ 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 -1
+ # 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 -1
fi
printf "Launching sbt from .sbtlib\n"
java \
-Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=256m \
- -jar ${JAR} \
- "$@"
+ -jar ${JAR} \
+ "$@"
fi