You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/03 20:25:03 UTC
[12/21] git commit: refactor $FWD variable
refactor $FWD variable
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/cc37b315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/cc37b315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/cc37b315
Branch: refs/heads/master
Commit: cc37b3151cb606ecf1c35865202dc2a08741281c
Parents: 84849ba
Author: Andrew xia <ju...@intel.com>
Authored: Sun Sep 29 22:00:19 2013 +0800
Committer: Andrew xia <ju...@intel.com>
Committed: Sun Sep 29 22:00:19 2013 +0800
----------------------------------------------------------------------
bin/pyspark | 2 +-
bin/run-example | 2 +-
bin/spark | 4 ++--
sbin/compute-classpath.sh | 2 +-
sbin/spark-class | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/cc37b315/bin/pyspark
----------------------------------------------------------------------
diff --git a/bin/pyspark b/bin/pyspark
index 45a2308..392a92b 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -37,7 +37,7 @@ if [ ! -f "$FWDIR/RELEASE" ]; then
fi
# Load environment variables from conf/spark-env.sh, if it exists
-if [ -e $FWDIR/conf/spark-env.sh ] ; then
+if [ -e "$FWDIR/conf/spark-env.sh" ] ; then
. $FWDIR/conf/spark-env.sh
fi
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/cc37b315/bin/run-example
----------------------------------------------------------------------
diff --git a/bin/run-example b/bin/run-example
index f29bb2c..ded08a8 100755
--- a/bin/run-example
+++ b/bin/run-example
@@ -26,7 +26,7 @@ FWDIR="$(cd `dirname $0`/..; pwd)"
export SPARK_HOME="$FWDIR"
# Load environment variables from conf/spark-env.sh, if it exists
-if [ -e $FWDIR/conf/spark-env.sh ] ; then
+if [ -e "$FWDIR/conf/spark-env.sh" ] ; then
. $FWDIR/conf/spark-env.sh
fi
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/cc37b315/bin/spark
----------------------------------------------------------------------
diff --git a/bin/spark b/bin/spark
index aa005a5..f5f7440 100755
--- a/bin/spark
+++ b/bin/spark
@@ -26,7 +26,7 @@ FWDIR="$(cd `dirname $0`/..; pwd)"
export SPARK_HOME="$FWDIR"
# Load environment variables from conf/spark-env.sh, if it exists
-if [ -e $FWDIR/conf/spark-env.sh ] ; then
+if [ -e "$FWDIR/conf/spark-env.sh" ] ; then
. $FWDIR/conf/spark-env.sh
fi
@@ -62,7 +62,7 @@ JAVA_OPTS="$OUR_JAVA_OPTS"
JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$SPARK_LIBRARY_PATH"
JAVA_OPTS="$JAVA_OPTS -Xms$APP_MEM -Xmx$APP_MEM"
# Load extra JAVA_OPTS from conf/java-opts, if it exists
-if [ -e $FWDIR/conf/java-opts ] ; then
+if [ -e "$FWDIR/conf/java-opts" ] ; then
JAVA_OPTS="$JAVA_OPTS `cat $FWDIR/conf/java-opts`"
fi
export JAVA_OPTS
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/cc37b315/sbin/compute-classpath.sh
----------------------------------------------------------------------
diff --git a/sbin/compute-classpath.sh b/sbin/compute-classpath.sh
index c7819d4..d9217ec 100755
--- a/sbin/compute-classpath.sh
+++ b/sbin/compute-classpath.sh
@@ -26,7 +26,7 @@ SCALA_VERSION=2.9.3
FWDIR="$(cd `dirname $0`/..; pwd)"
# Load environment variables from conf/spark-env.sh, if it exists
-if [ -e $FWDIR/conf/spark-env.sh ] ; then
+if [ -e "$FWDIR/conf/spark-env.sh" ] ; then
. $FWDIR/conf/spark-env.sh
fi
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/cc37b315/sbin/spark-class
----------------------------------------------------------------------
diff --git a/sbin/spark-class b/sbin/spark-class
index 7f25fe1..3bdc29e 100755
--- a/sbin/spark-class
+++ b/sbin/spark-class
@@ -26,7 +26,7 @@ FWDIR="$(cd `dirname $0`/..; pwd)"
export SPARK_HOME="$FWDIR"
# Load environment variables from conf/spark-env.sh, if it exists
-if [ -e $FWDIR/conf/spark-env.sh ] ; then
+if [ -e "$FWDIR/conf/spark-env.sh" ] ; then
. $FWDIR/conf/spark-env.sh
fi
@@ -87,7 +87,7 @@ JAVA_OPTS="$OUR_JAVA_OPTS"
JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$SPARK_LIBRARY_PATH"
JAVA_OPTS="$JAVA_OPTS -Xms$SPARK_MEM -Xmx$SPARK_MEM"
# Load extra JAVA_OPTS from conf/java-opts, if it exists
-if [ -e $FWDIR/conf/java-opts ] ; then
+if [ -e "$FWDIR/conf/java-opts" ] ; then
JAVA_OPTS="$JAVA_OPTS `cat $FWDIR/conf/java-opts`"
fi
export JAVA_OPTS