Falling back to "user.dir" in case "APP_DIR" is missing

Federico Fissore · Federico Fissore · commit 6e8e3a7bad99 · 2015-06-29T14:47:13.000+02:00
diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
@@ -186,7 +186,11 @@ static public PreferencesMap getBoardPreferences() {
   }
 
   static public File getContentFile(String name) {
-    File installationFolder = new File(System.getProperty("APP_DIR"));
+    String appDir = System.getProperty("APP_DIR");
+    if (appDir == null || appDir.length() == 0) {
+      appDir = currentDirectory;
+    }
+    File installationFolder = new File(appDir);
     return new File(installationFolder, name);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,11 @@ static public PreferencesMap getBoardPreferences() {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`static public File getContentFile(String name) {`
`189`		`- File installationFolder = new File(System.getProperty("APP_DIR"));`
	`189`	`+ String appDir = System.getProperty("APP_DIR");`
	`190`	`+ if (appDir == null \|\| appDir.length() == 0) {`
	`191`	`+ appDir = currentDirectory;`
	`192`	`+ }`
	`193`	`+ File installationFolder = new File(appDir);`
`190`	`194`	`return new File(installationFolder, name);`
`191`	`195`	`}`
`192`	`196`