git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(changelog update)
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
Instance.java
diff --git
a/src/be/nikiroo/fanfix/Instance.java
b/src/be/nikiroo/fanfix/Instance.java
index aacf0c50860064a0f980077ad641ab36aa5d837d..fdd73b8d12cd306bd8727cf9fbbae153363139a3 100644
(file)
--- a/
src/be/nikiroo/fanfix/Instance.java
+++ b/
src/be/nikiroo/fanfix/Instance.java
@@
-30,11
+30,15
@@
public class Instance {
// Most of the rest is dependent upon this:
config = new ConfigBundle();
// Most of the rest is dependent upon this:
config = new ConfigBundle();
- String configDir = System.getenv("CONFIG_DIR");
+ String configDir = System.getProperty("CONFIG_DIR");
+ if (configDir == null) {
+ configDir = System.getenv("CONFIG_DIR");
+ }
if (configDir == null) {
configDir = new File(System.getProperty("user.home"), ".fanfix")
.getPath();
}
if (configDir == null) {
configDir = new File(System.getProperty("user.home"), ".fanfix")
.getPath();
}
+
if (configDir != null) {
if (!new File(configDir).exists()) {
new File(configDir).mkdirs();
if (configDir != null) {
if (!new File(configDir).exists()) {
new File(configDir).mkdirs();
@@
-145,7
+149,7
@@
public class Instance {
/**
* Get the (unique) {link StringIdBundle} for the program.
/**
* Get the (unique) {link StringIdBundle} for the program.
- *
+ *
* @return the {link StringIdBundle}
*/
public static StringIdBundle getTrans() {
* @return the {link StringIdBundle}
*/
public static StringIdBundle getTrans() {