Repository: spark Updated Branches: refs/heads/branch-2.0 c99ad9215 -> 702755f92
[SPARK-15542][SPARKR] Make error message clear for script './R/install-dev.sh' when R is missing on Mac https://issues.apache.org/jira/browse/SPARK-15542 ## What changes were proposed in this pull request? When running`./R/install-dev.sh` in **Mac OS EI Captain** environment, I got ``` mbp185-xr:spark xin$ ./R/install-dev.sh usage: dirname path ``` This message is very confusing to me, and then I found R is not properly configured on my Mac when this script is using `$(which R)` to get R home. I tried similar situation on CentOS with R missing, and it's giving me very clear error message while MacOS is not. on CentOS: ``` [rootip-xxx-31-9-xx spark]# which R /usr/bin/which: no R in (/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/lib/jvm/java-1.7.0-openjdk.x86_64/bin:/root/bin) ``` but on Mac, if not found then nothing returned and this is causing the confusing message for R build failure and running R/install-dev.sh: ``` mbp185-xr:spark xin$ which R mbp185-xr:spark xin$ ``` Here I just added a clear message for this miss configuration for R when running `R/install-dev.sh`. ``` mbp185-xr:spark xin$ ./R/install-dev.sh Cannot find R home by running 'which R', please make sure R is properly installed. ``` ## How was this patch tested? Manually tested on local machine. Author: Xin Ren <iamsh...@126.com> Closes #13308 from keypointt/SPARK-15542. (cherry picked from commit 6ab973ec51f3db72de1766ad8d8316b7a58ed0a0) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/702755f9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/702755f9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/702755f9 Branch: refs/heads/branch-2.0 Commit: 702755f9292ec2b4cd2a216a931bed6ba29ac549 Parents: c99ad92 Author: Xin Ren <iamsh...@126.com> Authored: Thu May 26 21:25:13 2016 -0500 Committer: Sean Owen <so...@cloudera.com> Committed: Thu May 26 21:25:23 2016 -0500 ---------------------------------------------------------------------- R/install-dev.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/702755f9/R/install-dev.sh ---------------------------------------------------------------------- diff --git a/R/install-dev.sh b/R/install-dev.sh index befd413..ada6303 100755 --- a/R/install-dev.sh +++ b/R/install-dev.sh @@ -38,7 +38,12 @@ pushd $FWDIR > /dev/null if [ ! -z "$R_HOME" ] then R_SCRIPT_PATH="$R_HOME/bin" - else + else + # if system wide R_HOME is not found, then exit + if [ ! `command -v R` ]; then + echo "Cannot find 'R_HOME'. Please specify 'R_HOME' or make sure R is properly installed." + exit 1 + fi R_SCRIPT_PATH="$(dirname $(which R))" fi echo "USING R_HOME = $R_HOME" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
