aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorzsloan2020-07-28 12:51:54 -0500
committerzsloan2020-07-28 12:51:54 -0500
commit8e93afc7bcbb5bc12e43b0cdd2158894f633ae87 (patch)
treed1ba4c6a62023259679682f33e20bbc307955ab2 /bin
parent92088d72ad284a664eb1a53127c13ca2e6b4f602 (diff)
parent40f761b5b1f4e5fe24dde4ace91065f1007c0aa1 (diff)
downloadgenenetwork2-8e93afc7bcbb5bc12e43b0cdd2158894f633ae87.tar.gz
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'bin')
-rwxr-xr-xbin/genenetwork24
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/genenetwork2 b/bin/genenetwork2
index 3ae08e0a..dd6db7d6 100755
--- a/bin/genenetwork2
+++ b/bin/genenetwork2
@@ -121,7 +121,7 @@ if [ -z $GN2_PROFILE ]; then
read -p "PRESS [ENTER] TO CONTINUE..."
else
export PATH=$GN2_PROFILE/bin:$PATH
- export PYTHONPATH="$GN2_PROFILE/lib/python2.7/site-packages" # never inject another PYTHONPATH!!
+ export PYTHONPATH="$PYTHON_GN_PATH:$GN2_PROFILE/lib/python2.7/site-packages" # never inject another PYTHONPATH!!
export R_LIBS_SITE=$GN2_PROFILE/site-library
export JS_GUIX_PATH=$GN2_PROFILE/share/genenetwork2/javascript
export GUIX_GTK3_PATH="$GN2_PROFILE/lib/gtk-3.0"
@@ -154,7 +154,7 @@ if [ ! -d $R_LIBS_SITE ] ; then
fi
# We may change this one:
-export PYTHONPATH=$GN2_BASE_DIR/wqflask:$PYTHONPATH
+export PYTHONPATH=$PYTHON_GN_PATH:$GN2_BASE_DIR/wqflask:$PYTHONPATH
# Our UNIX TMPDIR defaults to /tmp - change this on a shared server
if [ -z $TMPDIR ]; then