[education/rkward] /: Fix failure to install R support package "sub-architecture 'R' is not installed"

[Thomas Friedrichsmeier]

Git commit 98f3dd9beaa3b1ce5d0102e87e46fb8e6c3a6ba0 by Thomas Friedrichsmeier.
Committed on 07/07/2022 at 21:48.
Pushed by tfry into branch 'master'.

Fix failure to install R support package "sub-architecture 'R' is not installed"

M  +1    -0    ChangeLog
M  +1    -1    rkward/rbackend/rkrbackend.cpp
M  +1    -1    rkward/rbackend/rpackages/rkward/R/rk.output.R

https://invent.kde.org/education/rkward/commit/98f3dd9beaa3b1ce5d0102e87e46fb8e6c3a6ba0

diff --git a/ChangeLog b/ChangeLog
index fb18eaec..54197873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+- Fixed: Problem installing R support package in some configurations
 - Fixed: Menubar would disapper after opening script editor, in some configurations
 - Fixed: Very long error messages during R markdown preview could cause the preview window to become too wide
 - Many new basic and advanced R, R Markdown and LaTeX snippets
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index 251df2c9..f6926ec7 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -1709,7 +1709,7 @@ void RKRBackend::initialize (const QString &locale_dir) {
 	                  "  suppressWarnings (try ({library (\"rkward\", lib.loc=libloc); " + versioncheck + "; ok <- TRUE}))\n"
 	                  "  if (!ok) {\n"
 	                  "    suppressWarnings (try (detach(\"package:rkward\", unload=TRUE)))\n"
-	                  "    install.packages(normalizePath(paste(libloc, \"..\", c (\"rkward.tgz\", \"rkwardtests.tgz\"), sep=\"/\")), lib=libloc, repos=NULL, type=\"source\")\n"
+	                  "    install.packages(normalizePath(paste(libloc, \"..\", c (\"rkward.tgz\", \"rkwardtests.tgz\"), sep=\"/\")), lib=libloc, repos=NULL, type=\"source\", INSTALL_opts=\"--no-multiarch\")\n"
 	                  "    library (\"rkward\", lib.loc=libloc)\n"
 	                  "  }\n"
 	                  "  .libPaths(c(.libPaths(), libloc))\n" // Add to end search path: Will be avaiable for help serach, but hopefully, not get into the way, otherwise
diff --git a/rkward/rbackend/rpackages/rkward/R/rk.output.R b/rkward/rbackend/rpackages/rkward/R/rk.output.R
index 410cdb87..e5985141 100644
--- a/rkward/rbackend/rpackages/rkward/R/rk.output.R
+++ b/rkward/rbackend/rpackages/rkward/R/rk.output.R
@@ -92,7 +92,7 @@ if and only if there are unsaved changes pending."
 		close=function(discard=NULL) {
 "Forget about this output file, also closing any open views. Note: Trying to call any further methods on this object will fail."
 			.rk.do.call("output", c ("close", .checkId(), if(is.null(discard)) "ask" else if(isTRUE(discard)) "force" else "fail"))
-			id=NULL
+			id<-NULL
 		},
 		view=function(raise=TRUE) {
 "Open this output for viewing in the frontend."