Skip to content

Commit

Permalink
Correct a mistake.
Browse files Browse the repository at this point in the history
  • Loading branch information
Non-Contradiction committed Oct 2, 2017
1 parent 288cb33 commit ef85c8a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ julia_setup <- function(JULIA_HOME = NULL, verbose = TRUE, force = FALSE, useRCa

if (verbose) message(paste0("Julia at location ", JULIA_HOME, " will be used."))

julia_line("-e \"pkg = string(:RCall); if Pkg.installed(pkg) == nothing Pkg.add(pkg) end; using Suppressor\"",
stderr = FALSE)
## julia_line("-e \"pkg = string(:RCall); if Pkg.installed(pkg) == nothing Pkg.add(pkg) end; using Suppressor\"",
## stderr = FALSE)

## Thank to randy3k for pointing this out,
## `RCall` needs to be precompiled with the current R.

## julia_line(paste(system.file("julia/RCallprepare.jl", package = "JuliaCall"), R.home()),
## stderr = FALSE)
julia_line(paste(system.file("julia/RCallprepare.jl", package = "JuliaCall"), R.home()),
stderr = FALSE)

julia_line("-e \"pkg = string(:Suppressor); if Pkg.installed(pkg) == nothing Pkg.add(pkg) end; using Suppressor\"",
stderr = FALSE)
Expand Down
4 changes: 2 additions & 2 deletions inst/julia/RCallprepare.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
## <https://github.com/Non-Contradiction/JuliaCall/issues/9>
## as well as coming up with the solution

check_args(ARGS)

Rhome = ARGS[1]

## println(Rhome)

ENV["R_HOME"] = Rhome

if Pkg.installed("RCall") == nothing
Expand Down

0 comments on commit ef85c8a

Please sign in to comment.