Merge pull request #1426 from Alanocallaghan/orca_check

cpsievert · web-flow · commit 2368c0c05a16 · 2018-12-07T11:29:58.000-06:00
Check for plotly's orca not just orca
diff --git a/R/orca.R b/R/orca.R
@@ -204,9 +204,14 @@ orca_serve <- function(port = 5151, mathjax = FALSE, safe = FALSE, request_limit
   )
 }
 
+correct_orca <- function() {
+  orca_help <- processx::run("orca", "-h")
+  grepl("plotly", orca_help[["stdout"]], ignore.case = TRUE)
+}
+
 
 orca_available <- function() {
-  if (Sys.which("orca") == "") {
+  if (Sys.which("orca") == "" || !correct_orca()) {
     stop(
       "The orca command-line utility is required for this functionality.\n\n",
       "Please follow the installation instructions here -- https://github.com/plotly/orca#installation",

Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,14 @@ orca_serve <- function(port = 5151, mathjax = FALSE, safe = FALSE, request_limit`
`204`	`204`	`)`
`205`	`205`	`}`
`206`	`206`
	`207`	`+correct_orca <- function() {`
	`208`	`+ orca_help <- processx::run("orca", "-h")`
	`209`	`+ grepl("plotly", orca_help[["stdout"]], ignore.case = TRUE)`
	`210`	`+}`
	`211`	`+`
`207`	`212`
`208`	`213`	`orca_available <- function() {`
`209`		`- if (Sys.which("orca") == "") {`
	`214`	`+ if (Sys.which("orca") == "" \|\| !correct_orca()) {`
`210`	`215`	`stop(`
`211`	`216`	`"The orca command-line utility is required for this functionality.\n\n",`
`212`	`217`	`"Please follow the installation instructions here -- https://github.com/plotly/orca#installation",`