Also overwrite getSettingsFolder() and make settings world-writable

gohai · gohai · commit b01ddb733a72 · 2017-05-06T09:21:20.000+02:00
diff --git a/app/src/processing/app/Console.java b/app/src/processing/app/Console.java
@@ -112,11 +112,14 @@ public boolean accept(File file) {
         }
       } else {
         consoleDir.mkdirs();
+        consoleDir.setWritable(true, false);
       }
 
       File outFile = new File(consoleDir, stamp + ".out");
+      outFile.setWritable(true, false);
       stdoutFile = new FileOutputStream(outFile);
       File errFile = new File(consoleDir, stamp + ".err");
+      errFile.setWritable(true, false);
       stderrFile = new FileOutputStream(errFile);
 
       consoleOut = new PrintStream(new ConsoleStream(false));
diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java
@@ -147,6 +147,7 @@ static private String loadLanguage() {
   static public void saveLanguage(String language) {
     try {
       Util.saveFile(language, prefFile);
+      prefFile.setWritable(true, false);
     } catch (Exception e) {
       e.printStackTrace();
     }
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
@@ -216,6 +216,7 @@ static public void save() {
       try {
         File dir = preferencesFile.getParentFile();
         File preferencesTemp = File.createTempFile("preferences", ".txt", dir);
+        preferencesTemp.setWritable(true, false);
 
         // Fix for 0163 to properly use Unicode when writing preferences.txt
         PrintWriter writer = PApplet.createWriter(preferencesTemp);
diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java
@@ -69,7 +69,7 @@ private ContributionListing() {
 
     //listingFile = Base.getSettingsFile("contributions.txt");
     listingFile = Base.getSettingsFile(LOCAL_FILENAME);
-    listingFile.setWritable(true);
+    listingFile.setWritable(true, false);
     if (listingFile.exists()) {
       setAdvertisedList(listingFile);
     }
@@ -422,7 +422,7 @@ public void run() {
 //          System.out.println(contribInfo.length() + " " + contribInfo);
 
           File tempContribFile = Base.getSettingsFile("contribs.tmp");
-          tempContribFile.setWritable(true);
+          tempContribFile.setWritable(true, false);
           ContributionManager.download(url, base.getInstalledContribsInfo(),
                                        tempContribFile, progress);
           if (!progress.isCanceled() && !progress.isError()) {
diff --git a/app/src/processing/app/platform/LinuxPlatform.java b/app/src/processing/app/platform/LinuxPlatform.java
@@ -77,6 +77,16 @@ public void initBase(Base base) {
   // Attempt to work around this in the least invasive manner,
   // so that "sudo -E processing" or "sudo -E processing-java"
   // will pick up the invoking user's sketchbook folder instead.
+  public File getSettingsFolder() throws Exception {
+    String sysEnvHome = System.getenv("HOME");
+    if (sysEnvHome != null && 0 < sysEnvHome.length()) {
+      return new File(sysEnvHome, ".processing");
+    } else {
+      return super.getSettingsFolder();
+    }
+  }
+
+
   public File getDefaultSketchbookFolder() throws Exception {
     String sysEnvHome = System.getenv("HOME");
     if (sysEnvHome != null && 0 < sysEnvHome.length()) {
diff --git a/app/src/processing/app/ui/Recent.java b/app/src/processing/app/ui/Recent.java
@@ -103,6 +103,7 @@ static protected void load() throws IOException {
 
 
   static protected void save() {
+    file.setWritable(true, false);
     PrintWriter writer = PApplet.createWriter(file);
     writer.println(VERSION);
     for (Record record : records) {

Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,14 @@ public boolean accept(File file) {`
`112`	`112`	`}`
`113`	`113`	`} else {`
`114`	`114`	`consoleDir.mkdirs();`
	`115`	`+ consoleDir.setWritable(true, false);`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`File outFile = new File(consoleDir, stamp + ".out");`
	`119`	`+ outFile.setWritable(true, false);`
`118`	`120`	`stdoutFile = new FileOutputStream(outFile);`
`119`	`121`	`File errFile = new File(consoleDir, stamp + ".err");`
	`122`	`+ errFile.setWritable(true, false);`
`120`	`123`	`stderrFile = new FileOutputStream(errFile);`
`121`	`124`
`122`	`125`	`consoleOut = new PrintStream(new ConsoleStream(false));`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ static private String loadLanguage() {`
`147`	`147`	`static public void saveLanguage(String language) {`
`148`	`148`	`try {`
`149`	`149`	`Util.saveFile(language, prefFile);`
	`150`	`+ prefFile.setWritable(true, false);`
`150`	`151`	`} catch (Exception e) {`
`151`	`152`	`e.printStackTrace();`
`152`	`153`	`}`