From f576cadfba11dd96788f5c70e63fba4a70899584 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Thu, 21 May 2020 15:46:43 +0200
Subject: [PATCH] [fix] installation instructions: pip install -e searx
 (setup.py)

In the past we did not really install searx into the virtualenv.  This is a
problem, since entry-points and other python installation stuff is not trigger.

See discussion: https://github.com/asciimoo/searx/pull/1938#issuecomment-632056508

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 docs/build-templates/searx.rst |  9 ++++++++-
 utils/searx.sh                 | 13 ++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/build-templates/searx.rst b/docs/build-templates/searx.rst
index 964deb23d..5cb70e95f 100644
--- a/docs/build-templates/searx.rst
+++ b/docs/build-templates/searx.rst
@@ -112,8 +112,15 @@ ${fedora_build}
        $SEARX_PYENV/bin/python
        Python 3.8.1
 
+       # update pip's boilerplate ..
+       pip install -U pip
+       pip install -U setuptools
+       pip install -U wheel
+
+       # jump to searx's working tree and install searx into virtualenv
        (${SERVICE_USER})$ cd "$SEARX_SRC"
-       (${SERVICE_USER})$ ./manage.sh update_packages
+       (${SERVICE_USER})$ pip install -e .
+
 
 .. END manage.sh update_packages
 
diff --git a/utils/searx.sh b/utils/searx.sh
index 1499b928f..d55ec5dba 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -309,7 +309,10 @@ update_searx() {
 cd ${SEARX_SRC}
 git checkout -B "$GIT_BRANCH"
 git pull
-${SEARX_SRC}/manage.sh update_packages
+pip install -U pip
+pip install -U setuptools
+pip install -U wheel
+pip install -U -e .
 EOF
     install_settings
     uWSGI_restart "$SEARX_UWSGI_APP"
@@ -468,8 +471,12 @@ EOF
     wait_key
     info_msg "install needed python packages"
     tee_stderr 0.1 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 |  prefix_stdout "$_service_prefix"
-pip install wheel
-${SEARX_SRC}/manage.sh update_packages
+pip install -U pip
+pip install -U setuptools
+pip install -U wheel
+pip install -U -e .
+cd ${SEARX_SRC}
+pip install -e .
 EOF
 }