From f32b4fceddf698f6a33c42a866ca21c6cc202841 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Thu, 2 Apr 2020 20:27:44 +0200
Subject: [PATCH] LXC: add virtualenv to LXC_BASE_PACKAGES

Commit 09a40625 adds virtualenv dependency.  BTW remove deprecated
--no-site-packages.  Not having access to global site-packages is now the
default behavior.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/lib.sh          | 8 ++++----
 utils/makefile.python | 2 +-
 utils/searx.sh        | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/utils/lib.sh b/utils/lib.sh
index 76173d8a..60476610 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -952,7 +952,7 @@ pkg_install() {
             ;;
         arch)
             # shellcheck disable=SC2068
-            pacman -S --noconfirm $@
+            pacman -Sy --noconfirm $@
             ;;
         fedora)
             # shellcheck disable=SC2068
@@ -1098,13 +1098,13 @@ EOF
 }
 
 # apt packages
-LXC_BASE_PACKAGES_debian="bash git build-essential python3"
+LXC_BASE_PACKAGES_debian="bash git build-essential python3 virtualenv"
 
 # pacman packages
-LXC_BASE_PACKAGES_arch="bash git base-devel python"
+LXC_BASE_PACKAGES_arch="bash git base-devel python python-virtualenv"
 
 # dnf packages
-LXC_BASE_PACKAGES_fedora="bash git @development-tools python"
+LXC_BASE_PACKAGES_fedora="bash git @development-tools python virtualenv"
 
 case $DIST_ID in
     ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
diff --git a/utils/makefile.python b/utils/makefile.python
index 49944442..df16acbb 100644
--- a/utils/makefile.python
+++ b/utils/makefile.python
@@ -30,7 +30,6 @@ PYLINT_RC ?= .pylintrc
 TEST_FOLDER  ?= ./tests
 TEST         ?= .
 
-VTENV_OPTS   = "--no-site-packages"
 PY_ENV       = ./$(LXC_ENV_FOLDER)local/py$(PY)
 PY_ENV_BIN   = $(PY_ENV)/bin
 PY_ENV_ACT   = . $(PY_ENV_BIN)/activate
@@ -41,6 +40,7 @@ ifeq ($(OS),Windows_NT)
   PY_ENV_ACT = $(PY_ENV_BIN)/activate
 endif
 
+VTENV_OPTS ?=
 ifeq ($(PYTHON),python)
   VIRTUALENV   = virtualenv
 else
diff --git a/utils/searx.sh b/utils/searx.sh
index 17e8db84..981c498f 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -42,7 +42,7 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
 
 # apt packages
 SEARX_PACKAGES_debian="\
-python3-dev python3-babel python3-venv
+virtualenv python3-dev python3-babel python3-venv
 uwsgi uwsgi-plugin-python3
 git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
 shellcheck"
@@ -53,7 +53,7 @@ texlive-latex-recommended texlive-extra-utils ttf-dejavu"
 
 # pacman packages
 SEARX_PACKAGES_arch="\
-python python-pip python-lxml python-babel
+python-virtualenv python python-pip python-lxml python-babel
 uwsgi uwsgi-plugin-python
 git base-devel libxml2
 shellcheck"
@@ -64,7 +64,7 @@ texlive-core texlive-latexextra ttf-dejavu"
 
 # dnf packages
 SEARX_PACKAGES_fedora="\
-python python-pip python-lxml python-babel
+virtualenv python python-pip python-lxml python-babel
 uwsgi uwsgi-plugin-python3
 git @development-tools libxml2
 ShellCheck"