diff options
| author | zuotingbing <zuo.tingbing9@zte.com.cn> | 2017-04-02 15:31:13 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2017-04-02 15:31:13 +0100 |
| commit | 76de2d115364aa6a1fdaacdfae05f0c695c953b8 (patch) | |
| tree | f3800e3d639727aa3ee33bee9423e4bf1ce85d9d /R/create-docs.sh | |
| parent | d40cbb861898de881621d5053a468af570d72127 (diff) | |
| download | spark-76de2d115364aa6a1fdaacdfae05f0c695c953b8.tar.gz spark-76de2d115364aa6a1fdaacdfae05f0c695c953b8.tar.bz2 spark-76de2d115364aa6a1fdaacdfae05f0c695c953b8.zip | |
[SPARK-20123][BUILD] SPARK_HOME variable might have spaces in it(e.g. $SPARK…
JIRA Issue: https://issues.apache.org/jira/browse/SPARK-20123
## What changes were proposed in this pull request?
If $SPARK_HOME or $FWDIR variable contains spaces, then use "./dev/make-distribution.sh --name custom-spark --tgz -Psparkr -Phadoop-2.7 -Phive -Phive-thriftserver -Pmesos -Pyarn" build spark will failed.
## How was this patch tested?
manual tests
Author: zuotingbing <zuo.tingbing9@zte.com.cn>
Closes #17452 from zuotingbing/spark-bulid.
Diffstat (limited to 'R/create-docs.sh')
| -rwxr-xr-x | R/create-docs.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/R/create-docs.sh b/R/create-docs.sh index 6bef7e75e3..310dbc5fb5 100755 --- a/R/create-docs.sh +++ b/R/create-docs.sh @@ -33,15 +33,15 @@ export FWDIR="$(cd "`dirname "${BASH_SOURCE[0]}"`"; pwd)" export SPARK_HOME="$(cd "`dirname "${BASH_SOURCE[0]}"`"/..; pwd)" # Required for setting SPARK_SCALA_VERSION -. "${SPARK_HOME}"/bin/load-spark-env.sh +. "${SPARK_HOME}/bin/load-spark-env.sh" echo "Using Scala $SPARK_SCALA_VERSION" -pushd $FWDIR > /dev/null -. $FWDIR/find-r.sh +pushd "$FWDIR" > /dev/null +. "$FWDIR/find-r.sh" # Install the package (this will also generate the Rd files) -. $FWDIR/install-dev.sh +. "$FWDIR/install-dev.sh" # Now create HTML files @@ -49,7 +49,7 @@ pushd $FWDIR > /dev/null mkdir -p pkg/html pushd pkg/html -"$R_SCRIPT_PATH/"Rscript -e 'libDir <- "../../lib"; library(SparkR, lib.loc=libDir); library(knitr); knit_rd("SparkR", links = tools::findHTMLlinks(paste(libDir, "SparkR", sep="/")))' +"$R_SCRIPT_PATH/Rscript" -e 'libDir <- "../../lib"; library(SparkR, lib.loc=libDir); library(knitr); knit_rd("SparkR", links = tools::findHTMLlinks(paste(libDir, "SparkR", sep="/")))' popd |