diff options
| author | Pjotr Prins | 2018-02-15 10:30:52 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2018-03-26 09:29:29 +0000 |
| commit | 3de1ecfa37b73b4cb011b634c8b4afc2362f858c (patch) | |
| tree | 43c3478a7f45d966a1b73a008ebfe107aeabbd1a /bin | |
| parent | 11577cd84db5d7cc9cf10c2178d1f782a9809260 (diff) | |
| download | genenetwork2-3de1ecfa37b73b4cb011b634c8b4afc2362f858c.tar.gz | |
Fixing authentication stuff so it uses parameters properly. Also no PYTHONPATH needed as
it is now in the Guix build.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/genenetwork2 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/genenetwork2 b/bin/genenetwork2 index 74ed7f9b..31fefbd3 100755 --- a/bin/genenetwork2 +++ b/bin/genenetwork2 @@ -95,11 +95,13 @@ export WQFLASK_OVERRIDES=$overrides # JSON echo WQFLASK_SETTINGS=$settings echo WQFLASK_OVERRIDES=$overrides -if [ -z $ELASTICSEARCH_PROFILE ]; then - echo -e "\033[1;33mWARNING: Elastic Search profile has not been set - use ELASTICSEARCH_PROFILE\033[0m"; -else - PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$ELASTICSEARCH_PROFILE/lib/python2.7/site-packages" -fi +# This is a temporary hack to inject ES - should have added python2-elasticsearch package to guix instead +# if [ -z $ELASTICSEARCH_PROFILE ]; then +# echo -e "WARNING: Elastic Search profile has not been set - use ELASTICSEARCH_PROFILE"; +# else +# PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$ELASTICSEARCH_PROFILE/lib/python2.7/site-packages" +# fi + if [ -z $GN2_PROFILE ] ; then echo "WARNING: GN2_PROFILE has not been set - you need the environment, so I hope you know what you are doing!" export GN2_PROFILE=$(dirname $(dirname $(which genenetwork2))) |