diff options
| author | shane-huang <shengsheng.huang@intel.com> | 2013-09-23 16:13:46 +0800 |
|---|---|---|
| committer | shane-huang <shengsheng.huang@intel.com> | 2013-09-23 16:13:46 +0800 |
| commit | 1d53792a0a48695824c29274be84b74d8d6a2e6a (patch) | |
| tree | b4949d671593b2b37b839fcb96bbb0e5c997d0ea /sbin | |
| parent | 1d1a6258008fa6d0e3aeeee35169315e441ec2c5 (diff) | |
| download | spark-1d53792a0a48695824c29274be84b74d8d6a2e6a.tar.gz spark-1d53792a0a48695824c29274be84b74d8d6a2e6a.tar.bz2 spark-1d53792a0a48695824c29274be84b74d8d6a2e6a.zip | |
add scripts in bin
Signed-off-by: shane-huang <shengsheng.huang@intel.com>
Diffstat (limited to 'sbin')
| -rwxr-xr-x | sbin/spark-class | 4 | ||||
| -rw-r--r-- | sbin/spark-class2.cmd | 4 | ||||
| -rwxr-xr-x | sbin/spark-executor | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sbin/spark-class b/sbin/spark-class index e111ef6da7..7f25fe1050 100755 --- a/sbin/spark-class +++ b/sbin/spark-class @@ -20,7 +20,7 @@ SCALA_VERSION=2.9.3 # Figure out where the Scala framework is installed -FWDIR="$(cd `dirname $0`; pwd)" +FWDIR="$(cd `dirname $0`/..; pwd)" # Export this as SPARK_HOME export SPARK_HOME="$FWDIR" @@ -104,7 +104,7 @@ if [ ! -f "$FWDIR/RELEASE" ]; then fi # Compute classpath using external script -CLASSPATH=`$FWDIR/bin/compute-classpath.sh` +CLASSPATH=`$FWDIR/sbin/compute-classpath.sh` export CLASSPATH if [ "$SPARK_PRINT_LAUNCH_COMMAND" == "1" ]; then diff --git a/sbin/spark-class2.cmd b/sbin/spark-class2.cmd index d4d853e8ad..5e00bd39ea 100644 --- a/sbin/spark-class2.cmd +++ b/sbin/spark-class2.cmd @@ -20,7 +20,7 @@ rem set SCALA_VERSION=2.9.3 rem Figure out where the Spark framework is installed -set FWDIR=%~dp0 +set FWDIR=%~dp0..\ rem Export this as SPARK_HOME set SPARK_HOME=%FWDIR% @@ -67,7 +67,7 @@ if "%FOUND_JAR%"=="0" ( rem Compute classpath using external script set DONT_PRINT_CLASSPATH=1 -call "%FWDIR%bin\compute-classpath.cmd" +call "%FWDIR%sbin\compute-classpath.cmd" set DONT_PRINT_CLASSPATH=0 rem Figure out where java is. diff --git a/sbin/spark-executor b/sbin/spark-executor index 2c07c54843..214e00f6f8 100755 --- a/sbin/spark-executor +++ b/sbin/spark-executor @@ -17,6 +17,7 @@ # limitations under the License. # -FWDIR="`dirname $0`" +FWDIR="$(cd `dirname $0`/..; pwd)" + echo "Running spark-executor with framework dir = $FWDIR" -exec $FWDIR/spark-class org.apache.spark.executor.MesosExecutorBackend +exec $FWDIR/sbin/spark-class org.apache.spark.executor.MesosExecutorBackend |