Skip to content

Fixed path for rzeppelin package for some users. [ZEPPELIN-810] Revise R Tutorial notebook [ZEPPELIN-811] #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elbamos wants to merge 1 commit into from
Closed

Fixed path for rzeppelin package for some users. [ZEPPELIN-810] Revise R Tutorial notebook [ZEPPELIN-811] #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
453 changes: 155 additions & 298 deletions notebook/r/note.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions r/src/main/scala/org/apache/zeppelin/rinterpreter/RContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,11 @@ object RContext {
val portsFile = File.createTempFile("rscala-", "")
val processInstance = processCmd.run(processIO)
// Find rzeppelin
val libpath : String = if (Files.exists(Paths.get("R/lib"))) "R/lib"
val basePath : String = SparkInterpreter.getSystemDefault("ZEPPELIN_HOME", "zeppelin.home", "./")
val libpath : String = if (Files.exists(Paths.get(basePath + "R/lib"))) basePath + "R/lib"
else if (Files.exists(Paths.get("R/lib"))) "R/lib"
else if (Files.exists(Paths.get("../R/lib"))) "../R/lib"
else throw new RuntimeException("Could not find rzeppelin - it must be in either R/lib or ../R/lib")
else throw new RuntimeException("Could not find rzeppelin - it should be in either $ZEPPELIN_HOME/R/lib, ./R/lib or ../R/lib")
val snippet =
s"""
library(lib.loc="$libpath", rzeppelin)
Expand All @@ -317,5 +319,4 @@ q(save='no')"""
contextMap.put(id, context)
context
}
}

}