on master help sign in
searx.sh: add buildhost cmd, installs OS packages for builds

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit80f7b658047a3541697ef5ae1aae897817b3f43c authorMarkus Heiser <markus.heiser@darmarit.de> dateMon 9 Mar 2020, 01:37 (7 years ago) parentf5f83b8
4 files changed+41−13
docs/admin/buildhosts.rst+2−1 utils/lxc.sh+1−1 utils/makefile.python+1 utils/searx.sh+37−11
docs/admin/buildhosts.rst+2−1
@@ -104,7 +104,8 @@ For PDF output you also need:
104104
105105 $ sudo dnf install \
106106 texlive-collection-fontsrecommended texlive-collection-latex \
107− dejavu-sans-fonts dejavu-serif-fonts dejavu-sans-mono-fonts
107+ dejavu-sans-fonts dejavu-serif-fonts dejavu-sans-mono-fonts \
108+ ImageMagick
108109
109110.. _sh lint:
110111
utils/lxc.sh+1−1
@@ -236,7 +236,7 @@ main() {
236236 shift
237237 lxc_exec_cmd "${name}" "$@"
238238 ;;
239− *) usage "uknown or missing container <name> $2"; exit 42;;
239+ *) usage "uknown or missing container <name> $1"; exit 42;;
240240 esac
241241 ;;
242242 install)
utils/makefile.python+1
@@ -204,6 +204,7 @@ pyclean:
204204pyenv: $(PY_ENV)
205205$(PY_ENV): python-exe
206206 $(call cmd,virtualenv,$(PY_ENV))
207+ @$(PY_ENV_BIN)/pip install $(PIP_VERBOSE) -U wheel pip setuptools
207208 @$(PY_ENV_BIN)/pip install $(PIP_VERBOSE) -r requirements.txt
208209
209210PHONY += pylint-exe
utils/searx.sh+37−11
@@ -41,27 +41,47 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
4141SEARX_PACKAGES_debian="\
4242python3-dev python3-babel python3-venv
4343uwsgi uwsgi-plugin-python3
44−git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
45−shellcheck"
44+git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev"
45+
46+BUILD_PACKAGES_debian="\
47+shellcheck graphviz imagemagick texlive-xetex librsvg2-bin
48+texlive-latex-recommended texlive-extra-utils ttf-dejavu"
4649
4750# pacman packages
4851SEARX_PACKAGES_arch="\
4952python python-pip python-lxml python-babel
5053uwsgi uwsgi-plugin-python
51−git base-devel libxml2
52−shellcheck"
54+git base-devel libxml2"
55+
56+BUILD_PACKAGES_arch="\
57+shellcheck graphviz imagemagick texlive-bin extra/librsvg
58+texlive-core texlive-latexextra ttf-dejavu"
5359
5460# dnf packages
5561SEARX_PACKAGES_fedora="\
5662python python-pip python-lxml python-babel
5763uwsgi uwsgi-plugin-python3
58−git @development-tools libxml2
59−ShellCheck"
64+git @development-tools libxml2"
65+
66+BUILD_PACKAGES_fedora="\
67+ShellCheck graphviz graphviz-gd ImageMagick librsvg2-tools
68+texlive-xetex-bin texlive-collection-fontsrecommended
69+texlive-collection-latex dejavu-sans-fonts dejavu-serif-fonts
70+dejavu-sans-mono-fonts"
6071
6172case $DIST_ID in
62− ubuntu|debian) SEARX_PACKAGES="${SEARX_PACKAGES_debian}" ;;
63− arch) SEARX_PACKAGES="${SEARX_PACKAGES_arch}" ;;
64− fedora) SEARX_PACKAGES="${SEARX_PACKAGES_fedora}" ;;
73+ ubuntu|debian)
74+ SEARX_PACKAGES="${SEARX_PACKAGES_debian}"
75+ BUILD_PACKAGES="${BUILD_PACKAGES_debian}"
76+ ;;
77+ arch)
78+ SEARX_PACKAGES="${SEARX_PACKAGES_arch}"
79+ BUILD_PACKAGES="${BUILD_PACKAGES_arch}"
80+ ;;
81+ fedora)
82+ SEARX_PACKAGES="${SEARX_PACKAGES_fedora}"
83+ BUILD_PACKAGES="${BUILD_PACKAGES_fedora}"
84+ ;;
6585esac
6686
6787# Apache Settings
@@ -111,6 +131,7 @@ install / remove
111131 :uwsgi: install searx uWSGI application
112132 :settings: reinstall settings from ${REPO_ROOT}/searx/settings.yml
113133 :packages: install needed packages from OS package manager
134+ :buildhost: install packages from OS package manager needed by buildhost
114135update searx
115136 Update searx installation ($SERVICE_HOME)
116137activate service
@@ -172,7 +193,13 @@ main() {
172193 searx-src) clone_searx ;;
173194 settings) install_settings ;;
174195 uwsgi) install_searx_uwsgi;;
175− packages) pkg_install "$SEARX_PACKAGES" ;;
196+ packages)
197+ pkg_install "$SEARX_PACKAGES"
198+ ;;
199+ buildhost)
200+ pkg_install "$SEARX_PACKAGES"
201+ pkg_install "$BUILD_PACKAGES"
202+ ;;
176203 *) usage "$_usage"; exit 42;;
177204 esac ;;
178205 update)
@@ -730,4 +757,3 @@ EOF
730757# ----------------------------------------------------------------------------
731758main "$@"
732759# ----------------------------------------------------------------------------
733−