solution for #1244 (#1250)

* solution for #1244 * update NEWS.md * compacting
r-lib · Jul 5, 2016 · c101cb0 · c101cb0
1 parent 4593165
commit c101cb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # devtools 1.12.0.9000
 
+* fix auto download method selection for `install_github()` on R 3.1 which
+  lacks "libcurl" in `capabilities()`. (@kiwiroy, #1244)
+
 # devtools 1.12.0
 
 ## New features

diff --git a/R/download-method.R b/R/download-method.R
@@ -1,4 +1,4 @@
-# Adapated from:
+# Adapted from:
 # https://github.com/rstudio/rstudio/blob/master/src/cpp/session/modules/SessionPackages.R
 #
 # Copyright (C) 2009-12 by RStudio, Inc.
@@ -12,9 +12,9 @@ download_method <- function(x) {
 }
 
 auto_download_method <- function() {
-  if (capabilities("libcurl")) {
+  if (isTRUE(capabilities("libcurl"))) {
     "libcurl"
-  } else if (capabilities("http/ftp")) {
+  } else if (isTRUE(capabilities("http/ftp"))) {
     "internal"
   } else if (nzchar(Sys.which("wget"))) {
     "wget"