From 0bfc61dbe9a7b54b1053f9c92f9ff04d8ff7e1bc Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 16 Feb 2020 22:29:06 +0100
Subject: [PATCH] tooling box: misc fixes from lxc tests

Tested by:

  sudo -H ./utils/lxc.sh build containers
  sudo -H ./utils/lxc.sh cmd /share/searx/utils/searx.sh    install all
  sudo -H ./utils/lxc.sh cmd /share/searx/utils/filtron.sh  install all
  sudo -H ./utils/lxc.sh cmd /share/searx/utils/morty.sh    install all

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 docs/admin/installation.rst | 4 ++--
 utils/filtron.sh            | 1 -
 utils/lib.sh                | 2 +-
 utils/searx.sh              | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/admin/installation.rst b/docs/admin/installation.rst
index 67358e99..a4c7eb8b 100644
--- a/docs/admin/installation.rst
+++ b/docs/admin/installation.rst
@@ -33,9 +33,9 @@ Install packages:
 
       .. code-block:: sh
 
-         $ sudo -H apt-get install \
+         $ sudo -H apt-get install -m \
                    git build-essential
-                   libxslt-dev python3-dev python3-babel \
+                   libxslt-dev python3-dev python3-babel python3-venv \
                    zlib1g-dev libffi-dev libssl-dev
 
 Install searx:
diff --git a/utils/filtron.sh b/utils/filtron.sh
index 2cbea402..13bb7675 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -322,7 +322,6 @@ EOF
 
     if ! service_is_available "${PUBLIC_URL}"; then
         err_msg "Public service at ${PUBLIC_URL} is not available!"
-        echo -e "${_Green}stop with [${_BCyan}CTRL-C${_Green}] or .."
         wait_key
     fi
 
diff --git a/utils/lib.sh b/utils/lib.sh
index a7efb78e..a045c91a 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -802,7 +802,7 @@ pkg_install() {
         return 42
     fi
     # shellcheck disable=SC2068
-    apt-get install -y $@
+    apt-get install -m -y $@
 }
 
 pkg_remove() {
diff --git a/utils/searx.sh b/utils/searx.sh
index 73bdd551..942aa07c 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -40,7 +40,7 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
 SEARX_APT_PACKAGES="\
   uwsgi uwsgi-plugin-python3 \
   git build-essential \
-  libxslt-dev python3-dev python3-babel\
+  libxslt-dev python3-dev python3-babel python3-venv \
   zlib1g-dev libffi-dev libssl-dev \
 "