From 7b4cf2eb489d8f6c95ccac5af180254b78e7c460 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 29 Mar 2020 15:09:34 +0200 Subject: tooling box: simplify build enviroments - no more need for a .config.mk - docs: use searx.brands environment - searx.sh, filtron.sh & morty.sh are sourcing utils/brand.env Signed-off-by: Markus Heiser --- docs/conf.py | 6 +++--- docs/dev/makefile.rst | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/conf.py b/docs/conf.py index c2b2bbd84..761465c47 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,10 +5,10 @@ from sphinx_build_tools import load_sphinx_config from searx.version import VERSION_STRING from pallets_sphinx_themes import ProjectLink -GIT_URL = os.environ.get("GIT_URL", "https://github.com/asciimoo/searx") +from searx.brand import GIT_URL GIT_BRANCH =os.environ.get("GIT_BRANCH", "master") -SEARX_URL = os.environ.get("SEARX_URL", "https://searx.me") -DOCS_URL = os.environ.get("DOCS_URL", "https://asciimoo.github.io/searx/") +from searx.brand import SEARX_URL +from searx.brand import DOCS_URL # Project -------------------------------------------------------------- diff --git a/docs/dev/makefile.rst b/docs/dev/makefile.rst index ed9942f4c..85aea8ae9 100644 --- a/docs/dev/makefile.rst +++ b/docs/dev/makefile.rst @@ -44,8 +44,7 @@ Makefile setup .. _git stash: https://git-scm.com/docs/git-stash -The main setup is done in the :origin:`.config.sh` (read :ref:`toolboxing -setup`):: +The main setup is done in the :origin:`Makefile`:: export SEARX_URL=https://searx.me -- cgit v1.2.3