Skip to content

Commit c1e561f

Browse files
committed
1 parent ccec0fc commit c1e561f

17 files changed

Lines changed: 40 additions & 33 deletions

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.3
5-
Date: 2016-03-18
4+
Version: 0.17.4
5+
Date: 2016-03-19
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.4 (2016-03-19)
2+
---------------------------
3+
BUG FIXES:
4+
* URL: http://cran.rstudio.com (moved to https://cran.rstudio.com/)
5+
6+
7+
18
installr 0.17.3 (2016-03-18)
29
---------------------------
310

R/RStudio_CRAN_data.R

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#'
4646
#' This function downlaod these files based on the code from the downlaod page (\url{http://cran-logs.rstudio.com/}) into a temporary folder.
4747
#' @details
48-
#' RStudio maintains its own CRAN mirror, \url{http://cran.rstudio.com} and offers its log files.
48+
#' RStudio maintains its own CRAN mirror, \url{https://cran.rstudio.com} and offers its log files.
4949
#' @param START the defaults is 5 days before today. A character string of the START date for files to be downloaded. The date format is "YYYY-MM-DD".
5050
#' @param END the defaults is today. A character string of the END date for files to be downloaded.
5151
#' The date format is "YYYY-MM-DD".
@@ -132,7 +132,7 @@ download_RStudio_CRAN_data <- function(START = as.Date(Sys.time())-5,
132132
#' This function relies on data.table to run faster.
133133
#' WARNING: this function can be quite slow...
134134
#' @details
135-
#' RStudio maintains its own CRAN mirror, \url{http://cran.rstudio.com} and offers its log files.
135+
#' RStudio maintains its own CRAN mirror, \url{https://cran.rstudio.com} and offers its log files.
136136
#' @param log_folder the folder which contains the RStudio CRAN log files that were downloaded to. Default is the temporary folder picked by \link{tempdir}.
137137
#' @param use_data_table default is TRUE. A switch for wether or not to use the data.table package
138138
#' in order to merge the log files using rbindlist. This function is MUCH faster then the alternative.
@@ -206,7 +206,7 @@ read_RStudio_CRAN_data <- function(log_folder = tempdir(), use_data_table = TRUE
206206
#' classes for the columns date, package, country. It also adds the columns weekday and week. Lastly, it also sets a key.
207207
#'
208208
#' @details
209-
#' RStudio maintains its own CRAN mirror, \url{http://cran.rstudio.com} and offers its log files.
209+
#' RStudio maintains its own CRAN mirror, \url{https://cran.rstudio.com} and offers its log files.
210210
#' @param dataset the RStudio CRAN mirror data object
211211
#' @param ... not in use.
212212
#' @author Felix Schonbrodt, Tal Galili
@@ -267,7 +267,7 @@ format_RStudio_CRAN_data <- function(dataset, ...) {
267267
#' This function is a first template for creating a barplot of the number of downloads a package had in a time period.
268268
#' This function is based on some other functions, have a look at the example for more details.
269269
#' @details
270-
#' RStudio maintains its own CRAN mirror, \url{http://cran.rstudio.com} and offers its log files.
270+
#' RStudio maintains its own CRAN mirror, \url{https://cran.rstudio.com} and offers its log files.
271271
#' @param pkg_name a string of the package we are interested in checking.
272272
#' @param dataset a dataset output from running \link{read_RStudio_CRAN_data}.
273273
#' @param remove_dups default is TRUE. Should the duplicate user ids (based on their ips) be removed. If TRUE, then the plot is the number of unique users who have downloaded our package everyday.
@@ -322,7 +322,7 @@ barplot_package_users_per_day <- function(pkg_name, dataset, remove_dups = TRUE,
322322
#' This function gets a vector of package names, and returns a line plot of
323323
#' number of downloads for these packages per week.
324324
#' @details
325-
#' RStudio maintains its own CRAN mirror, \url{http://cran.rstudio.com} and offers its log files.
325+
#' RStudio maintains its own CRAN mirror, \url{https://cran.rstudio.com} and offers its log files.
326326
#' @param pkg_names a character vector of packages we are interested in checking.
327327
#' @param dataset a dataset output from running \link{read_RStudio_CRAN_data}, after going through \link{format_RStudio_CRAN_data}.
328328
#' @param by_time by what time frame should packages be plotted? defaults to "date", but can also be "week"
@@ -401,7 +401,7 @@ lineplot_package_downloads <- function(pkg_names, dataset, by_time = c("date", "
401401
#' @description
402402
#' Gives the top "x" most downloaded packages.
403403
#' @details
404-
#' RStudio maintains its own CRAN mirror, \url{http://cran.rstudio.com} and offers its log files.
404+
#' RStudio maintains its own CRAN mirror, \url{https://cran.rstudio.com} and offers its log files.
405405
#' @param dataset a dataset output from running \link{read_RStudio_CRAN_data}, after going through \link{format_RStudio_CRAN_data}.
406406
#' @param n the number of top packages to show.
407407
#' @param ... not in use.
@@ -435,7 +435,7 @@ most_downloaded_packages <- function(dataset, n = 6L,...) {
435435
#' @description
436436
#' Plots a worldmap colored by the number of users installation for a given package
437437
#' @details
438-
#' RStudio maintains its own CRAN mirror, \url{http://cran.rstudio.com} and offers its log files.
438+
#' RStudio maintains its own CRAN mirror, \url{https://cran.rstudio.com} and offers its log files.
439439
#' @param pkg_name a character string of the package we are interested in.
440440
#' @param dataset a dataset output from running \link{read_RStudio_CRAN_data}.
441441
#' @param remove_dups logical (default is TRUE). Should the duplicate user ids (based on their ips) be removed.

R/install.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ install.ffmpeg <- function(...) install.FFmpeg(...)
11111111
#' @description Returns the search path for executable files based on %PATH%
11121112
#' @return A character vector with the search path for executable files
11131113
#' @references
1114-
#' \url{http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/ntcmds_shelloverview.mspx?mfr=true}
1114+
#' http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/ntcmds_shelloverview.mspx?mfr=true
11151115
#' @examples
11161116
#' \dontrun{
11171117
#' system.PATH() #

R/updateR.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ask.user.yn.question <- function(question, GUI = TRUE, add_lines_before = TRUE)
171171
#' }
172172
check.for.updates.R <- function(notify_user = TRUE,
173173
GUI = TRUE,
174-
page_with_download_url = "http://cran.rstudio.com/bin/windows/base/",
174+
page_with_download_url = "https://cran.rstudio.com/bin/windows/base/",
175175
pat = "R-[0-9.]+.+-win\\.exe") {
176176
# stringr::str_extract("R-3.2.4-win.exe", "R-[0-9.]+.+-win\\.exe")
177177
# stringr::str_extract("R-3.2.4revised-win.exe", "R-[0-9.]+.+-win\\.exe")
@@ -225,7 +225,7 @@ check.for.updates.R <- function(notify_user = TRUE,
225225

226226
#' @title See the NEWS file for the latest R release
227227
#' @export
228-
#' @description Sends the user the the NEWS html file on "http://cran.rstudio.com/bin/windows/base/NEWS.R-3.0.0.html" (URL changes with each version)
228+
#' @description Sends the user the the NEWS html file on "https://cran.rstudio.com/bin/windows/base/NEWS.R-3.0.0.html" (URL changes with each version)
229229
#' @param URL the URL of the page from which R can be downloaded.
230230
#' @param ... for future use
231231
#' @return invisible(NULL)
@@ -234,7 +234,7 @@ check.for.updates.R <- function(notify_user = TRUE,
234234
#' browse.latest.R.NEWS()
235235
#' }
236236
browse.latest.R.NEWS <- function(
237-
URL = "http://cran.rstudio.com/bin/windows/base/",...) {
237+
URL = "https://cran.rstudio.com/bin/windows/base/",...) {
238238
page_with_download_url <- URL
239239
page <- readLines(page_with_download_url, warn = FALSE)
240240
pat <- "NEWS.R-[0-9.]+.html"# this is the structure of the link...
@@ -267,12 +267,12 @@ browse.latest.R.NEWS <- function(
267267
#' @param ... extra parameters to pass to \link{install.URL}
268268
#' @return TRUE/FALSE - was the installation of R successful or not.
269269
#' @seealso \link{uninstall.R}, \link{install.Rdevel}, \link{updateR}, \link{system}
270-
#' @references \url{http://cran.rstudio.com/bin/windows/base/}
270+
#' @references \url{https://cran.rstudio.com/bin/windows/base/}
271271
#' @examples
272272
#' \dontrun{
273273
#' install.R()
274274
#' }
275-
install.R <- function(page_with_download_url = "http://cran.rstudio.com/bin/windows/base/",
275+
install.R <- function(page_with_download_url = "https://cran.rstudio.com/bin/windows/base/",
276276
pat = "R-[0-9.]+-win.exe",
277277
to_checkMD5sums = TRUE,
278278
keep_install_file = FALSE,
@@ -340,12 +340,12 @@ install.R <- function(page_with_download_url = "http://cran.rstudio.com/bin/wind
340340
#' @param ... extra parameters to pass to \link{install.URL}
341341
#' @return TRUE/FALSE - was the installation of R successful or not.
342342
#' @seealso \link{install.R}, \link{updateR}
343-
#' @references \url{http://cran.rstudio.com/bin/windows/base/rdevel.html}
343+
#' @references \url{https://cran.rstudio.com/bin/windows/base/rdevel.html}
344344
#' @examples
345345
#' \dontrun{
346346
#' install.Rdevel()
347347
#' }
348-
install.Rdevel <- function(exe_URL = "http://cran.rstudio.com/bin/windows/base/R-devel-win.exe", ...) {
348+
install.Rdevel <- function(exe_URL = "https://cran.rstudio.com/bin/windows/base/R-devel-win.exe", ...) {
349349
install.URL(exe_URL)
350350
}
351351

@@ -808,7 +808,7 @@ your packages to the new R installation.\n")
808808

809809
if(update_packages & copy_packages) { # we should not update packages if we didn't copy them first...
810810
new_Rscript_path <- file.path(new_R_path, "bin/Rscript.exe") # make sure to run the newer R to update the packages.
811-
update_packages_expression <- paste(new_Rscript_path, ' -e " setInternet2(TRUE); options(repos=structure(c(CRAN=\'http://cran.rstudio.com/\'))); update.packages(checkBuilt=TRUE, ask=FALSE) "')
811+
update_packages_expression <- paste(new_Rscript_path, ' -e " setInternet2(TRUE); options(repos=structure(c(CRAN=\'https://cran.rstudio.com/\'))); update.packages(checkBuilt=TRUE, ask=FALSE) "')
812812
# update_packages_expression <- paste(new_Rscript_path, ' -e "date()"')
813813
# update_packages_expression <- paste(new_Rscript_path, ' -e "print(R.version)"')
814814
system(update_packages_expression, wait = TRUE, intern = TRUE, show.output.on.console = TRUE)

man/barplot_package_users_per_day.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/browse.latest.R.NEWS.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/check.for.updates.R.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/download_RStudio_CRAN_data.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/format_RStudio_CRAN_data.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)