Skip to content

Commit a38a958

Browse files
committed
Code review feedback
1 parent 94e9f84 commit a38a958

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

bin/spark-class

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ if [ -e "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar ]; then
138138
fi
139139

140140
# Compute classpath using external script
141-
CLASSPATH_OUTPUT=$($FWDIR/bin/compute-classpath.sh)
141+
classpath_output=$($FWDIR/bin/compute-classpath.sh)
142142
if [[ "$?" != "0" ]]; then
143-
echo "$CLASSPATH_OUTPUT"
143+
echo "$classpath_output"
144144
exit 1
145145
else
146-
CLASSPATH=$CLASSPATH_OUTPUT
146+
CLASSPATH=$classpath_output
147147
fi
148148

149149
if [[ "$1" =~ org.apache.spark.tools.* ]]; then

make-distribution.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ fi
5858
JAVA_CMD=$JAVA_HOME/bin/java
5959
JAVA_VERSION=$($JAVA_CMD -version 2>&1)
6060
if ! [[ "$JAVA_VERSION" =~ "1.6" ]]; then
61-
echo "Error: Java version was not 1.6. Spark must be compiled with JDK 1.6 "
62-
echo "(see SPARK-1703). Output from 'java -version' was:"
61+
echo "Error: JAVA_HOME must point to a JDK 6 installation (see SPARK-1703)."
62+
echo "Output from 'java -version' was:"
6363
echo "$JAVA_VERSION"
6464
exit -1
6565
fi

0 commit comments

Comments
 (0)