From 9a622a9dd0e8467e50290396f7016bd01eea707e Mon Sep 17 00:00:00 2001 From: Rens Dofferhoff Date: Wed, 29 Nov 2023 19:51:09 +0100 Subject: [PATCH] Complete the matrixFix2 --- Modules/install-jaspBase.R.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Modules/install-jaspBase.R.in b/Modules/install-jaspBase.R.in index 6eeee30924..ae167fa5a2 100644 --- a/Modules/install-jaspBase.R.in +++ b/Modules/install-jaspBase.R.in @@ -45,17 +45,15 @@ if (md5SumsChanged(modulePkg, moduleLibrary)) { writeMd5Sums(modulePkg, moduleLibrary) -} - #This is necessary because of conflicts with Matrix dep of base R lib. #Can be removed when a new version of R updates its Matrix -if (!@IS_FLATPAK_USED@) { - - if (Sys.info()["sysname"] == "Darwin") { - options(pkgType = "source") - } + if (!@IS_FLATPAK_USED@) { + + if (Sys.info()["sysname"] == "Darwin") + options(pkgType = "source") - renv::install("Matrix", library = moduleLibrary, prompt = prompt) + renv::install("Matrix", library = moduleLibrary, prompt = prompt) + } } # Converting the absolute symlinks to relative symlinks on macOS