aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/genenetwork22
-rw-r--r--etc/default_settings.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/genenetwork2 b/bin/genenetwork2
index b3190f1e..236d8f63 100755
--- a/bin/genenetwork2
+++ b/bin/genenetwork2
@@ -74,7 +74,7 @@ else
export XDG_DATA_DIRS="$GN2_PROFILE/share"
export GIO_EXTRA_MODULES="$GN2_PROFILE/lib/gio/modules"
export LC_ALL=C # FIXME
- export GENENETWORK_FILES="$GN2_PROFILE/share/genenetwork2"
+ export GUIX_GENENETWORK_FILES="$GN2_PROFILE/share/genenetwork2"
export PLINK_COMMAND="$GN2_PROFILE/bin/plink2"
export PYLMM_COMMAND="$GN2_PROFILE/bin/pylmm_redis"
export GEMMA_COMMAND="$GN2_PROFILE/bin/gemma"
diff --git a/etc/default_settings.py b/etc/default_settings.py
index 1c5b10b4..1b609414 100644
--- a/etc/default_settings.py
+++ b/etc/default_settings.py
@@ -53,11 +53,13 @@ USE_REDIS = True # REDIS caching (note that redis will be phased out)
USE_GN_SERVER = 'False' # Use GN_SERVER SQL calls
HOME = os.environ['HOME']
+# ---- Default locations
+GENENETWORK_FILES = HOME+"/gn2_data" # base dir for all static data files
+
# ---- Path overrides for Genenetwork - the defaults are normally
# picked up from Guix or in the HOME directory
# TMPDIR is normally picked up from the environment
-# GENENETWORK_FILES = HOME+"/gn2_data" # base dir for all static data files
# PRIVATE_FILES = HOME+"/gn2_private_data" # private static data files (unused)
# ---- Local path to JS libraries - for development modules (only)