safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read guacamole.properties from home directory first.

Browse Source
This commit is contained in:
Michael Jumper
2013-01-31 10:01:55 -08:00
parent 0705f7099f
commit 69b7d7ead7
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
guacamole-common/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java
View File

@@ -37,6 +37,8 @@ package net.sourceforge.guacamole.properties;
*
* ***** END LICENSE BLOCK ***** */
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@@ -83,9 +85,36 @@ public class GuacamoleProperties {
try {
InputStream stream = GuacamoleProperties.class.getResourceAsStream("/guacamole.properties");
if (stream == null)
throw new IOException("Resource /guacamole.properties not found.");
// Attempt to find Guacamole home
File guacHome;
// Get explicitly specified directory, if any
String desiredDir = System.getProperty("guacamole.home");
if (desiredDir != null)
guacHome = new File(desiredDir);
// If not explicitly-define directory, use ~/.guacamole
else
guacHome = new File(System.getProperty("user.home"), ".guacamole");
InputStream stream;
// If not a directory, load from classpath
if (!guacHome.isDirectory()) {
// Read from classpath
stream = GuacamoleProperties.class.getResourceAsStream("/guacamole.properties");
if (stream == null)
throw new IOException(
"guacamole.properties not loaded from " + guacHome
+ " (not a directory), and guacamole.properties could"
+ " not be found as a resource in the classpath.");
}
// Otherwise, try to load from file
else
stream = new FileInputStream(new File(guacHome, "guacamole.properties"));
// Load properties, always close stream
try { properties.load(stream); }