Skip to content

Commit

Permalink
Merge branch 'release/fixes_#98'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Hill committed Sep 21, 2018
2 parents 0a87d90 + 68bd338 commit 32b9ece
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,26 @@ Authors@R: c(
Maintainer: Jon Hill <[email protected]>
URL: www.ficonsulting.com
BugReports: https://github.com/ficonsulting/RInno/issues
Description: Installs shiny apps using Inno Setup, an open source software that builds installers for Windows programs <http://www.jrsoftware.org/ishelp/>.
Description: Installs shiny apps packaged as stand-alone Electron apps using Inno Setup, an open source software that builds installers for Windows programs <http://www.jrsoftware.org/ishelp/>.
License: GPL-3 | file LICENSE
Encoding: UTF-8
LazyData: true
Depends:
R (>= 3.3.0)
Imports:
curl (>= 2.8.1),
glue (>= 1.1.1),
httr (>= 1.3.0),
installr (>= 0.19.0),
jsonlite (>= 1.5),
magrittr (>= 1.5),
methods (>= 3.5.1),
pkgbuild (>= 1.0.0),
remotes (>= 1.1.1),
rmarkdown (>= 1.6),
shiny (>= 1.0.4),
stringr (>= 1.2.0),
utils (>= 3.5.1)
curl,
glue (>= 1.2.0),
httr,
installr,
jsonlite,
magrittr,
methods,
pkgbuild,
remotes,
rmarkdown,
shiny,
stringr ,
utils
Suggests:
knitr,
stringi,
Expand Down
2 changes: 1 addition & 1 deletion R/code_section.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ code_section <- function(iss, R_version = paste0(">=", R.version$major, ".", R.v
inequality,
"numeric_version('", R_version, "')")

if (!R_version %in% R_versions) stop(glue::glue("R version - {R_version} - was not found on CRAN. Please use `R_version` to specify one that is or let us know if you think you received this message in error: \n\nhttps://github.com/ficonsulting/RInno/issues"), call. = FALSE)
if (!R_version %in% R_versions && interactive()) stop(glue::glue("R version - {R_version} - was not found on CRAN. Please use `R_version` to specify one that is or let us know if you think you received this message in error: \n\nhttps://github.com/ficonsulting/RInno/issues"), call. = FALSE)

results <- unlist(lapply(version_specs, function(x) eval(parse(text = x))))
acceptable_R_versions <-
Expand Down

0 comments on commit 32b9ece

Please sign in to comment.