Add a third default.

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

diff --git a/src/util/util.conf b/src/util/util.conf
index b7f9deb04565f360a02c1483a16e15f8435b5ee9..cdc4d3d67f09727c5baf38d903c0a1d97ca51440 100644 (file)
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -5,7 +5,10 @@
 # defaults with the syntax "${VAR:-default}".  Here, "default" can again
 # be a $-expression.
 #
-GNUNET_HOME = $HOME
+# 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:-${USERPROFILE}}}
 
 # see XDG Base Directory Specification at
 # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -15,7 +18,7 @@ GNUNET_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/
@@ -24,8 +27,8 @@ GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache/}gnunet/
 GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}gnunet/
 
 # Legacy option...
-SERVICEHOME = ~/.gnunet/
-# SERVICEHOME = /var/lib/gnunet/
+# GNUNET_TEST_HOME = ~/.gnunet/
+# GNUNET_TEST_HOME = /var/lib/gnunet/
 
 # DEFAULTCONFIG = /etc/gnunet.conf
 # If 'DEFAULTCONFIG' is not defined, the current