Merge pull request #139 from ajrgodfrey/master

fix to is.x64()

Author: talgalili

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: installr
 Type: Package
 Title: Using R to Install Stuff on Windows OS (Such As: R, 'Rtools', 'RStudio', 'Git', and More!)
-Version: 0.22.1
-Date: 2019-08-16
+Version: 0.22.2
+Date: 2019-11-28
 Authors@R: c(person("Tal", "Galili", role = c("aut", "cre", "cph"), email =
     "tal.galili@gmail.com", comment = "http://www.r-statistics.com"),
     person("Barry", "Rowlingson", role = "ctb", email =

NEWS.md

@@ -1,3 +1,8 @@
+installr 0.22.2 (2019-11-28)
+
+small edits to improve 32/64 bit architecture detection and appropriate download for Python.
+
+
 installr 0.22.0 (2019-08-02)
 ---------------------------
 

R/installPython.R

@@ -26,7 +26,7 @@
 #' @export
 #' @author Tal Galili and A. Jonathan R. Godfrey
 #' @param page_with_download_url a link to the list of download links for Python
-#' @param x64 logical: fetch a 64 bit version. default checks architecture of current R session.
+#' @param x64 logical: fetch a 64 bit version. default is TRUE; used to check architecture of current R session.
 #' @param version_number Either 2 or 3. Version 2/3 will lead to download of v2.7.xx/3.6.xx respectively.
 #' @param ... extra parameters to pass to \link{install.URL}
 #' @examples
@@ -37,7 +37,7 @@
 #' }
 install.python = function (page_with_download_url = "https://www.python.org/downloads/windows/",
                            version_number = 3,
-                           x64 = is.x64(),
+                           x64 = TRUE,
                              ...)
 {
   page <- readLines(page_with_download_url, warn = FALSE)

R/is.x.R

@@ -62,10 +62,9 @@ is.windows <- function(...) unname(Sys.info()["sysname"] == "Windows")
 #' @return Returns TRUE/FALSE if the R session is running on Windows 64-bit or not. 
 #' @export
 #' @examples
-#' \dontrun{
 #' is.x64() # returns TRUE on my machine.
-#' }
-is.x64 <- function(...) unname(Sys.info()["release"] == ">= 8 x64")
+
+is.x64 <- function(...)  .Platform$r_arch == "x64"
 
 
 #' @title Checks if the R session is running within RStudio