[education/rkward] /: Convert existing absolute paths to relative while converting legacy output.

Thomas Friedrichsmeier null at kde.org
Thu Mar 10 12:54:25 GMT 2022


Git commit 8be7cf43cb4a516b30e23adbf23da211f90d5337 by Thomas Friedrichsmeier.
Committed on 10/03/2022 at 12:53.
Pushed by tfry into branch 'master'.

Convert existing absolute paths to relative while converting legacy output.

M  +1    -1    VERSION.cmake
M  +1    -1    rkward/rbackend/rpackages/rkward/DESCRIPTION
M  +1    -1    rkward/rbackend/rpackages/rkward/R/rk.output.R

https://invent.kde.org/education/rkward/commit/8be7cf43cb4a516b30e23adbf23da211f90d5337

diff --git a/VERSION.cmake b/VERSION.cmake
index 4093af18..7e7d01ee 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,3 +1,3 @@
 # DO NOT CHANGE THIS FILE MANUALLY!
 # It will be overwritten by scripts/set_dist_version.sh
-SET(RKVERSION_NUMBER 0.7.2z+0.7.3+devel1)
+SET(RKVERSION_NUMBER 0.7.2z+0.7.3+devel2)
diff --git a/rkward/rbackend/rpackages/rkward/DESCRIPTION b/rkward/rbackend/rpackages/rkward/DESCRIPTION
index f7304768..c816fd30 100755
--- a/rkward/rbackend/rpackages/rkward/DESCRIPTION
+++ b/rkward/rbackend/rpackages/rkward/DESCRIPTION
@@ -18,7 +18,7 @@ Authors at R: c(person(given="Thomas", family="Friedrichsmeier",
         role=c("aut")), person(given="the RKWard team",
         email="rkward-devel at kde.org", role=c("cre","ctb")))
 Version: 0.7.3
-Date: 2020-10-17
+Date: 2022-03-10
 RoxygenNote: 7.1.2
 Collate: 
     'base_overrides.R'
diff --git a/rkward/rbackend/rpackages/rkward/R/rk.output.R b/rkward/rbackend/rpackages/rkward/R/rk.output.R
index eb519555..410cdb87 100644
--- a/rkward/rbackend/rpackages/rkward/R/rk.output.R
+++ b/rkward/rbackend/rpackages/rkward/R/rk.output.R
@@ -139,7 +139,7 @@ Do not write anything to the target filename, directly! This is purely for infor
 		out$activate()
 		wd = out$.workingDir()   # Don't do this at home, please. For internal use, only, and might change
 
-		stopifnot(file.copy(f, file.path(wd, "index.html"), overwrite=TRUE))
+		cat(gsub(paste("file://", rk.home(), sep=""), "./", readLines(f)), file=file.path(wd, "index.html"), sep="\n")
 		stopifnot(all(file.copy(files, file.path(wd, basename(files)), overwrite=TRUE)))
 		out$view()
 


More information about the rkward-tracker mailing list