Skip to content

Commit

Permalink
0.13.2 version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
talgalili committed Jan 31, 2014
1 parent e1b959a commit b30a156
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Original file line Diff line number Diff line change
@@ -1,10 +1,10 @@
Package: installr Package: installr
Type: Package Type: Package
Title: using R to install stuff (such as: R, Rtools RStudio, git, and more!) Title: using R to install stuff (such as: R, Rtools RStudio, git, and more!)
Version: 0.13.1 Version: 0.13.2
Date: 2014-01-31 Date: 2014-01-31
Authors@R: c(person("Tal Galili", "Developer", role = c("aut", "cre"), Authors@R: c(person("Tal Galili", "Developer", role = c("aut", "cre"),
email = "tal.galili@math.tau.ac.il"), person("Barry Rowlingson", email = "tal.galili@gmail.com"), person("Barry Rowlingson",
"Developer", role = "ctb", email = "b.rowlingson@lancaster.ac.uk"), "Developer", role = "ctb", email = "b.rowlingson@lancaster.ac.uk"),
person("Boris Hejblum", "Developer", role = "ctb") , person("Dason", person("Boris Hejblum", "Developer", role = "ctb") , person("Dason",
"Developer", role = "ctb") , person("Felix Schonbrodt", "Developer", role = "Developer", role = "ctb") , person("Felix Schonbrodt", "Developer", role =
Expand Down Expand Up @@ -32,8 +32,7 @@ URL: https://github.com/talgalili/installr/,
http://www.r-statistics.com/tag/installr/ http://www.r-statistics.com/tag/installr/
BugReports: https://github.com/talgalili/installr/issues BugReports: https://github.com/talgalili/installr/issues
Depends: Depends:
R (>= 2.11.0), R (>= 2.11.0)
tools
Imports: Imports:
utils utils
Suggests: Suggests:
Expand All @@ -43,5 +42,6 @@ Suggests:
data.table, data.table,
plyr, plyr,
ggplot2, ggplot2,
sp sp,
tools
License: GPL-2 License: GPL-2
12 changes: 12 additions & 0 deletions NEWS
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,15 @@
installr 0.13.2 (2014-01-31)
---------------------------

OTHER NOTES:
* moved tools from imports to suggest in order to avoid "call not declared from" error.
* Added "RdTags" as an internal function, since using tools:::RdTags caused too many problems.
* Fixed a single "@" in a roxygen2 doc (which caused erros)
* Changed main e-mail to be @gmail instead of @math.tau.ac.il.
* installr 0.13.2 is to be shipped to CRAN.



installr 0.13.1 (2014-01-31) installr 0.13.1 (2014-01-31)
--------------------------- ---------------------------


Expand Down
4 changes: 2 additions & 2 deletions R/updateR.r
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#' } #' }
checkMD5sums2 <- function (package, dir, md5file, omit_files,...) checkMD5sums2 <- function (package, dir, md5file, omit_files,...)
{ {
# require(tools) # making sure this is used. require(tools) # making sure this is used.
# R code in the package should call library or require only exceptionally. Such calls are never needed for packages listed in ‘Depends’ as they will already be on the search path. It used to be common practice to use require calls for packages listed in ‘suggests’ in functions which used their functionality, but nowadays it is better to access such functionality via :: calls. # R code in the package should call library or require only exceptionally. Such calls are never needed for packages listed in ‘Depends’ as they will already be on the search path. It used to be common practice to use require calls for packages listed in ‘suggests’ in functions which used their functionality, but nowadays it is better to access such functionality via :: calls.
# from: http://cran.r-project.org/doc/manuals/R-exts.html # from: http://cran.r-project.org/doc/manuals/R-exts.html


Expand Down Expand Up @@ -255,7 +255,7 @@ install.R <- function(page_with_download_url = "http://cran.rstudio.com/bin/wind
# checks the MD5sums from the new R installation: # checks the MD5sums from the new R installation:
if(to_checkMD5sums) { if(to_checkMD5sums) {
new_R_path <- get.installed.R.folders()[1] new_R_path <- get.installed.R.folders()[1]
# require(tools) require(tools)
pass_checkMD5sums <- checkMD5sums2(dir=new_R_path, omit_files = c("etc/Rconsole", "etc/Rprofile.site")) # will work! pass_checkMD5sums <- checkMD5sums2(dir=new_R_path, omit_files = c("etc/Rconsole", "etc/Rprofile.site")) # will work!
if(!pass_checkMD5sums) { if(!pass_checkMD5sums) {
warning("There was some problem with installing R. Some files are not what they should be (e.g: check MD5 sums did not pass all the tests). \n You can try installing R again (either manually or through install.R()), \n and if the problem persists you can file a bug report by running: bug.report(package = 'installr') ") warning("There was some problem with installing R. Some files are not what they should be (e.g: check MD5 sums did not pass all the tests). \n You can try installing R again (either manually or through install.R()), \n and if the problem persists you can file a bug report by running: bug.report(package = 'installr') ")
Expand Down

0 comments on commit b30a156

Please sign in to comment.