diff options
author | Benjamin Hindman <benjamin.hindman@gmail.com> | 2013-07-31 12:49:11 -0700 |
---|---|---|
committer | Benjamin Hindman <benjamin.hindman@gmail.com> | 2013-07-31 12:50:12 -0700 |
commit | 529ac81195505f59228fd212a5bad154ab316683 (patch) | |
tree | cb729bd0b142035a6bce06b43f1f2f221661d385 /run | |
parent | 4692ea48920cb7cebd2cf8cacc43382168801722 (diff) | |
download | spark-529ac81195505f59228fd212a5bad154ab316683.tar.gz spark-529ac81195505f59228fd212a5bad154ab316683.tar.bz2 spark-529ac81195505f59228fd212a5bad154ab316683.zip |
Do not try and use 'scala' in 'run' from within a "release".
Diffstat (limited to 'run')
-rwxr-xr-x | run | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -72,7 +72,10 @@ esac # hard to kill the child with stuff like Process.destroy(). However, for # the Spark shell, the wrapper is necessary to properly reset the terminal # when we exit, so we allow it to set a variable to launch with scala. -if [ "$SPARK_LAUNCH_WITH_SCALA" == "1" ]; then +# We still fall back on java for the shell if this is a "release" created +# from make-distribution.sh since it's possible scala is not installed +# but we have everything we need to run the shell. +if [[ "$SPARK_LAUNCH_WITH_SCALA" == "1" && ! -f "$FWDIR/RELEASE" ]]; then if [ "$SCALA_HOME" ]; then RUNNER="${SCALA_HOME}/bin/scala" else |