Skip to content

Commit

Permalink
also install R-stable (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kirill Müller committed Apr 22, 2015
1 parent 59a1587 commit 2f27b66
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
17 changes: 14 additions & 3 deletions Library.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,14 @@ Function DownloadAndUnpack {

$rurl = "http://cran.r-project.org/bin/windows/base/R-devel-win.exe"

Progress "Downloading R"
Progress "Downloading R (devel)"
Invoke-WebRequest $rurl -OutFile .\DL\R-devel-win.exe

$rurl_stable = "http://cran.r-project.org/bin/windows/base/R-3.2.0-win.exe"

Progress "Downloading R (stable)"
Invoke-WebRequest $rurl -OutFile .\DL\R-stable-win.exe

Progress "Determining Rtools version"
$rtoolsver = $(Invoke-WebRequest http://cran.r-project.org/bin/windows/Rtools/VERSION.txt).Content.Split(' ')[2].Split('.')[0..1] -Join ''
$rtoolsurl = "http://cran.r-project.org/bin/windows/Rtools/Rtools$rtoolsver.exe"
Expand All @@ -59,12 +64,18 @@ Function DownloadAndUnpack {
rm -Recurse -Force .\Image
md .\Image

# R
Progress "Extracting R"
# R (devel)
Progress "Extracting R (devel)"
.\Tools\innounp\innounp.exe -x -dImage .\DL\R-devel-win.exe > .\R-devel-win.log
mv ".\Image\{app}" .\Image\R
rm .\Image\install_script.iss

# R (stable)
Progress "Extracting R (stable)"
.\Tools\innounp\innounp.exe -x -dImage .\DL\R-stable-win.exe > .\R-stable-win.log
mv ".\Image\{app}" .\Image\R-stable
rm .\Image\install_script.iss

# R site library
Progress "Creating site library"
Exec { .\Image\R\bin\x64\Rscript.exe -e ".libPaths()" }
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test_script:
artifacts:
- path: R.tar.gz R.iso.gz R.vhd.gz
name: ISO
- path: R-devel-win.log R-packages.log Rtools-current.log
- path: R-devel-win.log R-stable-win.log R-packages.log Rtools-current.log
name: Logs

deploy:
Expand Down

0 comments on commit 2f27b66

Please sign in to comment.