Merge pull request #89 from wch/fix-phantom-check

Fix phantom installation logic
wch · Dec 13, 2019 · d206bd7 · d206bd7
2 parents 86a4f54 + 62a98a6
commit d206bd7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: webshot
 Title: Take Screenshots of Web Pages
-Version: 0.5.2
+Version: 0.5.2.9000
 Authors@R: c(
     person("Winston", "Chang", email = "winston@rstudio.com", role = c("aut", "cre")),
     person("Yihui", "Xie", role = "ctb"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+webshot 0.5.2.9000
+=============
+
+* Fixed logic in `install_phantomjs()` when `force=TRUE` is used. ([#89](https://github.com/wch/webshot/pull/89))
+
 webshot 0.5.2
 =============
 

diff --git a/R/utils.R b/R/utils.R
@@ -141,7 +141,7 @@ install_phantomjs <- function(version = '2.1.1',
     baseURL = 'https://github.com/wch/webshot/releases/download/v0.3.1/',
     force = FALSE) {
 
-  if (is_phantomjs_version_latest(version) && !force) {
+  if (!force && is_phantomjs_version_latest(version)) {
       message('It seems that the version of `phantomjs` installed is ',
               'greater than or equal to the requested version.',
               'To install the requested version or downgrade to another version, ',