Skip to content

Commit 7d2b4bf

Browse files
committed
copy.packages.between.libraries - can now deal with a file name such as "R-3.2.4revised-win.exe". (by fixing R_version_in_a_folder which was used inside get.installed.R.folders) - this should fix issue #53
1 parent aa33622 commit 7d2b4bf

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: installr
22
Type: Package
33
Title: Using R to Install Stuff (Such As: R, Rtools, RStudio, Git, and More!)
4-
Version: 0.17.5
5-
Date: 2016-03-20
4+
Version: 0.17.6
5+
Date: 2016-04-09
66
Authors@R: c(person("Tal", "Galili", role = c("aut", "cre", "cph"), email =
77
"tal.galili@gmail.com", comment = "http://www.r-statistics.com"),
88
person("Barry", "Rowlingson", role = "ctb", email =

NEWS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
installr 0.17.6 (2016-04-09)
2+
---------------------------
3+
4+
BUG FIXES:
5+
* copy.packages.between.libraries - can now deal with a file name such as "R-3.2.4revised-win.exe". (by fixing R_version_in_a_folder which was used inside get.installed.R.folders)
6+
7+
18
installr 0.17.5 (2016-03-20)
29
---------------------------
310

R/updateR.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ turn.number.version <- function(number_to_dots) {
449449
R_version_in_a_folder <- function(folder) {
450450
# folder = R.home()
451451
files <- list.files(folder)
452-
files <- gsub("patched", "", files)
452+
files <- gsub("patched|revised", "", files)
453453
ss <- grep("README.R-[0-9]+.[0-9]+.[0-9]+$", files)
454454
if(length(ss)==0) return(NA) # this means that the current folder is NOT an R installation folder with the file README.R-numbers
455455
README_x <- files[ss] # for example: "README.R-3.0.1"
@@ -568,7 +568,7 @@ get.installed.R.folders <- function(sort_by_version = TRUE, add_version_to_name
568568
#' # As before, but this time it will MOVE (instead of COPY) the packages.
569569
#' # e.g: erase them from their old location.
570570
#' }
571-
copy.packages.between.libraries <- function(from, to, ask =FALSE,keep_old = TRUE, do_NOT_override_packages_in_new_R = TRUE) {
571+
copy.packages.between.libraries <- function(from, to, ask = FALSE, keep_old = TRUE, do_NOT_override_packages_in_new_R = TRUE) {
572572

573573
installed_R_folders <- get.installed.R.folders()
574574
installed_R_folders_TABLE <-data.frame("R_version" = names(installed_R_folders) , Folder = installed_R_folders)

0 commit comments

Comments
 (0)