Skip to content

Commit 387aa8e

Browse files
committed
Added settings override
1 parent e4db3b9 commit 387aa8e

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

app/src/processing/app/Base.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2221,7 +2221,10 @@ static public File getSettingsFolder() {
22212221

22222222
try {
22232223
settingsFolder = Platform.getSettingsFolder();
2224-
2224+
var settingsOverride = System.getProperty("processing.settings.folder");
2225+
if (settingsOverride != null && !settingsOverride.isEmpty()) {
2226+
settingsFolder = new File(settingsOverride);
2227+
}
22252228
// create the folder if it doesn't exist already
22262229
if (!settingsFolder.exists()) {
22272230
if (!settingsFolder.mkdirs()) {

app/test/processing/app/SketchbookTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ class SketchbookTest {
1313
@Test
1414
fun sketchbookIsOverridableTest() {
1515
val directory = createTempDirectory("scaffolding")
16+
val preferences = directory.resolve("preferences")
17+
preferences.toFile().mkdirs()
1618
val sketchbook = directory.resolve("sketchbook")
1719
sketchbook.toFile().mkdirs()
20+
1821
System.setProperty("processing.sketchbook.folder", sketchbook.toAbsolutePath().toString())
22+
System.setProperty("processing.settings.folder", preferences.toAbsolutePath().toString())
1923

2024
val result = Base.getSketchbookFolder()
2125
assert(result.absolutePath == sketchbook.toAbsolutePath().toString())

0 commit comments

Comments
 (0)