Add a third default.

[oweals/gnunet.git] / src / util / util.conf

diff --git a/src/util/util.conf b/src/util/util.conf
index 7a4d3c704dbd9dcfb8ba71a4a06018574ef349e1..cdc4d3d67f09727c5baf38d903c0a1d97ca51440 100644 (file)
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -8,7 +8,7 @@
 # We usually want $HOME for $GNUNET_HOME, but we allow testcases to
 # easily override this by setting $GNUNET_TEST_HOME.
 #
-GNUNET_HOME = ${GNUNET_TEST_HOME:-$HOME}
+GNUNET_HOME = ${GNUNET_TEST_HOME:-${HOME:-${USERPROFILE}}}
 
 # see XDG Base Directory Specification at
 # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -18,7 +18,7 @@ GNUNET_HOME = ${GNUNET_TEST_HOME:-$HOME}
 GNUNET_DATA_HOME = ${XDG_DATA_HOME:-$GNUNET_HOME/.local/share}/gnunet/
 
 # Configuration files
-GNUNET_CONFIG_HOME = ${XDG_CONFIG_HOME:-GNUNET_HOME/.config/}gnunet/
+GNUNET_CONFIG_HOME = ${XDG_CONFIG_HOME:-$GNUNET_HOME/.config/}gnunet/
 
 # Cached data, no big deal if lost
 GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache/}gnunet/
@@ -27,7 +27,7 @@ GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache/}gnunet/
 GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}gnunet/
 
 # Legacy option...
-GNUNET_TEST_HOME = ~/.gnunet/
+# GNUNET_TEST_HOME = ~/.gnunet/
 # GNUNET_TEST_HOME = /var/lib/gnunet/
 
 # DEFAULTCONFIG = /etc/gnunet.conf