aboutsummaryrefslogtreecommitdiff
path: root/sbt
diff options
context:
space:
mode:
authorctn <ctn@ubuntu.ubuntu-domain>2013-07-17 11:27:11 -0700
committerctn <ctn@ubuntu.ubuntu-domain>2013-07-17 11:27:11 -0700
commita1d2c3434657f0d901a2f8cfddf62065b5ad4385 (patch)
tree299ec24d8d0b96c25138b85271ff88a6bc0bfb35 /sbt
parentb29c53e6aaecbefd05bce0390c2ec5a16b218059 (diff)
downloadspark-a1d2c3434657f0d901a2f8cfddf62065b5ad4385.tar.gz
spark-a1d2c3434657f0d901a2f8cfddf62065b5ad4385.tar.bz2
spark-a1d2c3434657f0d901a2f8cfddf62065b5ad4385.zip
[BUGFIX] Fix for sbt/sbt script SPARK_HOME setting
In some environments, this command export SPARK_HOME=$(cd "$(dirname $0)/.."; pwd) echoes two paths, one by the "cd ..", and one by the "pwd". Note the resulting erroneous -jar paths below: ctn@ubuntu:~/src/spark$ sbt/sbt + EXTRA_ARGS= + '[' '' '!=' '' ']' +++ dirname sbt/sbt ++ cd sbt/.. ++ pwd + export 'SPARK_HOME=/home/ctn/src/spark /home/ctn/src/spark' + SPARK_HOME='/home/ctn/src/spark /home/ctn/src/spark' + export SPARK_TESTING=1 + SPARK_TESTING=1 + java -Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=128m -jar /home/ctn/src/spark /home/ctn/src/spark/sbt/sbt-launch-0.11.3-2.jar Error: Invalid or corrupt jarfile /home/ctn/src/spark Committer: ctn <ctn@adatao.com> On branch master Changes to be committed: - Send output of the "cd .." part to /dev/null modified: sbt/sbt
Diffstat (limited to 'sbt')
-rwxr-xr-xsbt/sbt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sbt/sbt b/sbt/sbt
index 8c9a42824f..d64645e32d 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -22,7 +22,7 @@ if [ "$MESOS_HOME" != "" ]; then
EXTRA_ARGS="-Djava.library.path=$MESOS_HOME/lib/java"
fi
-export SPARK_HOME=$(cd "$(dirname $0)/.."; pwd)
+export SPARK_HOME=$(cd "$(dirname $0)/.." 2>&1 >/dev/null ; pwd)
export SPARK_TESTING=1 # To put test classes on classpath
java -Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=128m $EXTRA_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@"