Tachyon Path for Spark 1.4.1

tachyon.patch

Index: src/spark/sbin/start-master.sh
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/spark/sbin/start-master.sh	(revision 3a38a61d8dafe1584992d10feb2dfb2154da911f)
+++ src/spark/sbin/start-master.sh	(revision 652da5558b857355940906760e4112d8b7c2ce62)
@@ -34,6 +34,7 @@
         exit -1
       fi
       START_TACHYON=true
+      ORIGINAL_ARGS=$(echo "$ORIGINAL_ARGS" | sed "s/--with-tachyon//g")
       ;;
   esac
 shift
Index: src/spark/make-distribution.sh
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/spark/make-distribution.sh	(revision 897b1499e7aff6e3dfda32fd5c932795f67fd9a7)
+++ src/spark/make-distribution.sh	(revision 0bfa81002ff0aa93d8f4de5019fd35a0b4f005b3)
@@ -35,7 +35,7 @@
 SPARK_TACHYON=false
 TACHYON_VERSION="0.6.4"
 TACHYON_TGZ="tachyon-${TACHYON_VERSION}-bin.tar.gz"
-TACHYON_URL="https://github.com/amplab/tachyon/releases/download/v${TACHYON_VERSION}/${TACHYON_TGZ}"
+TACHYON_URL="http://tachyon-project.org/downloads/files/${TACHYON_VERSION}/${TACHYON_TGZ}"
 
 MAKE_TGZ=false
 NAME=none
@@ -260,12 +260,13 @@
   mkdir -p "$DISTDIR/tachyon/src/main/java/tachyon/web"
   cp -r "tachyon-${TACHYON_VERSION}"/{bin,conf,libexec} "$DISTDIR/tachyon"
   cp -r "tachyon-${TACHYON_VERSION}"/core/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web"
+  cp -r "tachyon-${TACHYON_VERSION}"/core "$DISTDIR/tachyon" #why required? ui doesnt work otherwise
 
   if [[ `uname -a` == Darwin* ]]; then
     # need to run sed differently on osx
-    nl=$'\n'; sed -i "" -e "s|export TACHYON_JAR=\$TACHYON_HOME/target/\(.*\)|# This is set for spark's make-distribution\\$nl  export TACHYON_JAR=\$TACHYON_HOME/../lib/\1|" "$DISTDIR/tachyon/libexec/tachyon-config.sh"
+    nl=$'\n'; sed -i "" -e "s|export TACHYON_JAR=\$TACHYON_HOME/core/\(.*\)|# This is set for spark's make-distribution\\$nl  export TACHYON_JARS=\$TACHYON_HOME/../lib/\1|" "$DISTDIR/tachyon/libexec/tachyon-config.sh"
   else
-    sed -i "s|export TACHYON_JAR=\$TACHYON_HOME/target/\(.*\)|# This is set for spark's make-distribution\n  export TACHYON_JAR=\$TACHYON_HOME/../lib/\1|" "$DISTDIR/tachyon/libexec/tachyon-config.sh"
+    sed -i "s|export TACHYON_JAR=\$TACHYON_HOME/core/target/\(.*\)|# This is set for spark's make-distribution\n  export TACHYON_JAR=\$TACHYON_HOME/../lib/\1|" "$DISTDIR/tachyon/libexec/tachyon-config.sh"
   fi
 
   popd > /dev/null