Only check Linux home.dir for property file, default to a hidden file…

… if no file is found. Closes #288
winder · Feb 20, 2016 · dc1c1d6 · dc1c1d6
1 parent 089b113
commit dc1c1d6
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/src/com/willwinder/universalgcodesender/utils/SettingsFactory.java b/src/com/willwinder/universalgcodesender/utils/SettingsFactory.java
@@ -62,24 +62,12 @@ else if (System.getProperty("os.name").toLowerCase().contains("windows")) {
         else {
             properties = new File(homeDir + propertiesFilename);
 
-            // Check homedir hidden/not hidden
+            // Check homedir for hidden / not hidden files
             json = new File(homeDir + "/" + jsonFilename);
             if (!json.exists()) {
+                // Default to hidden if none.
                 json = new File(homeDir + "/." + jsonFilename);
             }
-            // Check /etc
-            if (!json.exists()) {
-                json = new File("/etc/" + jsonFilename);
-            }
-            // Check /usr/share
-            if (!json.exists()) {
-                json = new File("/usr/share/UniversalGcodeSender/" + jsonFilename);
-            }
-
-            // No file.
-            if (!json.exists()) {
-                json       = new File(homeDir + "/" + jsonFilename);
-            }
         }
 
         return properties.exists() ? properties : json;