Skip to content

Commit 756d304

Browse files
authored
Merge pull request #332 from llaniewski/hotfix/rpackageinstall
Fixing errors in rpackages installation
2 parents 4866306 + 058155f commit 756d304

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ before_install:
5050
- tools/install.sh rdep
5151
- tools/install.sh rinside
5252
- sudo tools/install.sh python-dev
53-
- tools/install.sh rpython
5453
- tools/install.sh submodules
5554

5655
install:

tools/install.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ function install_rpackage {
7474
dir.create(p,recursive=TRUE);
7575
.libPaths(p);
7676
}
77+
if (! "$name" %in% available.packages()[,1]) stop("$name not available on CRAN");
7778
install.packages('$name', method="wget");
79+
if (! require('$name')) stop("Failed to load $name");
7880
EOF
7981
}
8082

@@ -245,6 +247,7 @@ do
245247
#try "Changing access to R lib paths" chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library
246248
;;
247249
-r|--rpackage)
250+
shift
248251
test -z "$1" && error "usage tools/install.sh [--github] --rpackage package_name"
249252
if $GITHUB
250253
then
@@ -272,7 +275,8 @@ do
272275
;;
273276
rpython)
274277
install_rpackage rjson
275-
install_rpackage rPython
278+
echo "rPython not supported anymore"
279+
# install_rpackage rPython
276280
;;
277281
rinside)
278282
if $GITHUB
@@ -283,6 +287,7 @@ do
283287
fi
284288
;;
285289
cuda)
290+
shift
286291
test -z "$1" && error "Version number needed for cuda install"
287292
CUDA=$1
288293
shift

0 commit comments

Comments
 (0)